mirrors/unicorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix possible segfault in hook del (#691) (#697)

Browse Source
This commit is contained in:
Ryan Hileman 2016-12-21 11:50:40 -05:00 committed by Nguyen Anh Quynh
parent b19f1607c6
commit 19b92a4a7e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
uc.c
View File

@ -1069,19 +1069,19 @@ uc_err uc_hook_add(uc_engine *uc, uc_hook *hh, int type, void *callback,
UNICORN_EXPORT
uc_err uc_hook_del(uc_engine *uc, uc_hook hh)
{
int i = 0;
int i;
struct hook *hook = (struct hook *)hh;
int type = hook->type;
while ((type >> i) > 0 && i < UC_HOOK_MAX) {
if ((type >> i) & 1) {
if (list_remove(&uc->hook[i], (void *)hh)) {
if (--hook->refs == 0) {
free(hook);
}
// we can't dereference hook->type if hook is invalid
// so for now we need to iterate over all possible types to remove the hook
// which is less efficient
// an optimization would be to align the hook pointer
// and store the type mask in the hook pointer.
for (i = 0; i < UC_HOOK_MAX; i++) {
if (list_remove(&uc->hook[i], (void *)hook)) {
if (--hook->refs == 0) {
free(hook);
}
}
i++;
}
return UC_ERR_OK;
}