x64dbg
/
zydis
mirror of https://github.com/x64dbg/zydis
1
0
Fork 0
Code Releases Activity

Fixed a bug in ZYDIS_CHECK that caused functions to run more than once on certain conditions

This commit is contained in:
flobernd 2017-01-11 17:29:26 +01:00
parent 9804bf1d3e
commit 5af25eee4b
3 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/Zydis/Status.h
View File

@ -141,6 +141,20 @@ enum ZydisStatusCode
*/ */
#define ZYDIS_SUCCESS(status) (status == ZYDIS_STATUS_SUCCESS) #define ZYDIS_SUCCESS(status) (status == ZYDIS_STATUS_SUCCESS)
/**
* @brief Checks if a zydis operation was successfull and returns the status-code, if not.
*
* @param status The zydis status-code to check.
*/
#define ZYDIS_CHECK(status) \
{ \
ZydisStatus s = status; \
if (!ZYDIS_SUCCESS(s)) \
{ \
return s; \
} \
}
/* ============================================================================================== */ /* ============================================================================================== */
#ifdef __cplusplus #ifdef __cplusplus

15
src/Decoder.c
View File

@ -29,20 +29,6 @@
#include <Zydis/Decoder.h> #include <Zydis/Decoder.h>
#include <Zydis/Internal/InstructionTable.h> #include <Zydis/Internal/InstructionTable.h>
/* ============================================================================================== */
/* Internal macros */
/* ============================================================================================== */
/* ---------------------------------------------------------------------------------------------- */
/* Helper macros */
/* ---------------------------------------------------------------------------------------------- */
#define ZYDIS_CHECK(status) \
if (status != ZYDIS_STATUS_SUCCESS) \
{ \
return status; \
}
/* ============================================================================================== */ /* ============================================================================================== */
/* Internal functions */ /* Internal functions */
/* ============================================================================================== */ /* ============================================================================================== */
@ -2291,6 +2277,7 @@ ZydisStatus ZydisDecoderInitInstructionDecoder(ZydisInstructionDecoder* decoder,
decoder->disassemblerMode = disassemblerMode; decoder->disassemblerMode = disassemblerMode;
decoder->input.buffer = NULL; decoder->input.buffer = NULL;
decoder->input.bufferLen = 0; decoder->input.bufferLen = 0;
decoder->instructionPointer = 0;
return ZYDIS_STATUS_SUCCESS; return ZYDIS_STATUS_SUCCESS;
} }

14
src/Formatter.c
View File

@ -32,20 +32,6 @@
#include <Zydis/Formatter.h> #include <Zydis/Formatter.h>
#include <Zydis/Utils.h> #include <Zydis/Utils.h>
/* ============================================================================================== */
/* Internal macros */
/* ============================================================================================== */
/* ---------------------------------------------------------------------------------------------- */
/* Helper macros */
/* ---------------------------------------------------------------------------------------------- */
#define ZYDIS_CHECK(status) \
if (status != ZYDIS_STATUS_SUCCESS) \
{ \
return status; \
}
/* ============================================================================================== */ /* ============================================================================================== */
/* String formatting */ /* String formatting */
/* ============================================================================================== */ /* ============================================================================================== */