Merge remote-tracking branch 'upstream/master'

2015-08-26 08:47:26 -07:00 · 2015-08-26 08:47:26 -07:00 · edc1c037b0
commit edc1c037b0
parent 095cdb5f9d 0ab4284719
2 changed files with 20 additions and 1 deletions
--- a/docs/unicorn-logo.txt
+++ b/docs/unicorn-logo.txt
@ -0,0 +1,19 @@
+                 /\'.         _,,
+                 |.\ \      .'_/
+            _.-- |(\\ \   .'_.'
+        _.-'   \_\\ \\_),/ _/
+      _).'  .:::::::.___  .'
+      //   ' ./::::::\\o\(
+     //     //::/   '"(   \
+    //_    //::(       '.  '.
+   /_'/   /||:::\        '.  \
+   '//    '\\:::':\_    -<_' _'-
+   / |     '\::/|::::.._   _  )(
+   | |       \:| \:(    '.(_'._)
+   | |        \(  \::.    '-)
+   \ \  .          '""""---.
+    \ \ \    .        _.-...)
+     \ \/\.  \:.___.-'..:::/
+      \ |\\:..\:::::'.::::/
+       '  '.:::::'..:::"'
+             '":::""'
--- a/uc.c
+++ b/uc.c
@ -284,7 +284,7 @@ uc_err uc_close(uch *handle)

    free(uc->hook_callbacks);
    
-    free(uc->memory_map);
+    free(uc->mapped_blocks);

    // finally, free uc itself.
    memset(uc, 0, sizeof(*uc));