Cxbx-Reloaded/subhook
1
0
Fork 0
mirror of https://github.com/Cxbx-Reloaded/subhook.git synced 2024-11-23 03:09:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix segfault in subhook_new()

Browse Source 
This fixes #51.
This commit is contained in:
Zeex 2020-11-02 20:14:49 +06:00
parent 1420130730
commit 6fae00efdf
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subhook_private.h
View File

@ -50,6 +50,6 @@ struct subhook_struct {
int subhook_unprotect(void *address, size_t size);
void *subhook_alloc_code(size_t size);
int subhok_free_code(void *address, size_t size);
int subhook_free_code(void *address, size_t size);
#endif /* SUBHOOK_PRIVATE_H */

2
subhook_unix.c
View File

@ -51,7 +51,7 @@ void *subhook_alloc_code(size_t size) {
0);
}
int subhok_free_code(void *address, size_t size) {
int subhook_free_code(void *address, size_t size) {
if (address == NULL) {
return 0;
}

2
subhook_windows.c
View File

@ -45,7 +45,7 @@ void *subhook_alloc_code(size_t size) {
SUBHOOK_CODE_PROTECT_FLAGS);
}
int subhok_free_code(void *address, size_t size) {
int subhook_free_code(void *address, size_t size) {
(void)size;
if (address == NULL) {

17
subhook_x86.c
View File

@ -462,7 +462,7 @@ SUBHOOK_EXPORT subhook_t SUBHOOK_API subhook_new(void *src,
void *dst,
subhook_flags_t flags) {
subhook_t hook;
int result;
int error;
hook = calloc(1, sizeof(*hook));
if (hook == NULL) {
@ -482,8 +482,8 @@ SUBHOOK_EXPORT subhook_t SUBHOOK_API subhook_new(void *src,
memcpy(hook->code, hook->src, hook->jmp_size);
result = subhook_unprotect(hook->src, hook->jmp_size);
if (result != 0) {
error = subhook_unprotect(hook->src, hook->jmp_size);
if (error != 0) {
goto error_exit;
}
@ -492,25 +492,25 @@ SUBHOOK_EXPORT subhook_t SUBHOOK_API subhook_new(void *src,
goto error_exit;
}
result = subhook_make_trampoline(
error = subhook_make_trampoline(
hook->trampoline,
hook->src,
hook->jmp_size,
&hook->trampoline_len,
hook->flags);
if (result != 0 && result != -EOVERFLOW) {
if (error != 0 && error != -EOVERFLOW) {
goto error_exit;
}
if (hook->trampoline_len == 0) {
free(hook->trampoline);
subhook_free_code(hook->trampoline, hook->trampoline_size);
hook->trampoline = NULL;
}
return hook;
error_exit:
free(hook->trampoline);
subhook_free_code(hook->trampoline, hook->trampoline_size);
free(hook->code);
free(hook);
@ -521,7 +521,8 @@ SUBHOOK_EXPORT void SUBHOOK_API subhook_free(subhook_t hook) {
if (hook == NULL) {
return;
}
subhok_free_code(hook->trampoline, hook->trampoline_size);
subhook_free_code(hook->trampoline, hook->trampoline_size);
free(hook->code);
free(hook);
}