Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bdshemu/bdshemu.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@


//
// shemu_printf - simple version
// shemu_internal_printf - simple version
//
#ifndef BDDISASM_NO_FORMAT
void
shemu_printf(
shemu_internal_printf(
SHEMU_CONTEXT *Context,
char *formatstring,
...
Expand All @@ -41,7 +41,7 @@ shemu_printf(
}
#else
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part needs to stay the same, only the name must be changed to shemu_internal_printf.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

void
shemu_printf(
shemu_internal_printf(
SHEMU_CONTEXT *Context,
char *formatstring,
...
Expand Down
8 changes: 7 additions & 1 deletion bdshemu/include/bdshemu_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
#endif


#ifndef BDDISASM_NO_FORMAT
#define shemu_printf(Context, formatstring, ...) shemu_internal_printf(Context, formatstring, __VA_ARGS__)
#else
#define shemu_printf(Context, formatstring, ...) do { (void)formatstring; shemu_internal_printf(Context, NULL, __VA_ARGS__); } while (0)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no NULL defined in bddisasm/bdshemu. There is, instead, ND_NULL - which you should use instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

#endif

// The SHELLBMP and STACKBMP are two bitmaps which hold the state of each shellcode byte and each stack byte.
// Inside SHELLBMP, we store whether a shellcode byte has been fetched for execution or not, and whether it was
// modified or not.
Expand Down Expand Up @@ -65,7 +71,7 @@


void
shemu_printf(
shemu_internal_printf(
SHEMU_CONTEXT *Context,
char *formatstring,
...
Expand Down
Loading