Merge pull request #1458 from bet4it/patch

Port some patches from Unicorn1 to Unicorn2
2021-11-03 20:59:42 +01:00
parent 9818840f4e aaf340d9e4
commit 6b5529fcb7
12 changed files with 165 additions and 23 deletions
--- a/uc.c
+++ b/uc.c
@ -1596,7 +1596,8 @@ uc_err uc_query(uc_engine *uc, uc_query_type type, size_t *result)
            return uc->query(uc, type, result);
        }
 #endif
-        return UC_ERR_ARG;
+        *result = uc->mode;
+        break;

    case UC_QUERY_TIMEOUT:
        *result = uc->timed_out;
@ -1992,4 +1993,4 @@ uc_err uc_ctl(uc_engine *uc, uc_control_type control, ...)
    va_end(args);

    return err;
-}
+}