Merge remote-tracking branch 'upstream/master' into change-handle-based-api

2015-08-30 00:02:33 -04:00
parent e74bc0db88 c23d387e2f
commit 3bd705a060
84 changed files with 5283 additions and 1274 deletions
--- a/samples/shellcode.c
+++ b/samples/shellcode.c
@ -104,7 +104,7 @@ static void test_i386(void)
    }

    // map 2MB memory for this emulation
-    uc_mem_map(uc, ADDRESS, 2 * 1024 * 1024);
+    uc_mem_map(uc, ADDRESS, 2 * 1024 * 1024, UC_PROT_ALL);

    // write machine code to be emulated to memory
    if (uc_mem_write(uc, ADDRESS, (uint8_t *)X86_CODE32_SELF, sizeof(X86_CODE32_SELF) - 1)) {