Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Chris Eagle 2015-08-26 08:47:26 -07:00
commit edc1c037b0
2 changed files with 20 additions and 1 deletions

19
docs/unicorn-logo.txt Normal file
View file

@ -0,0 +1,19 @@
/\'. _,,
|.\ \ .'_/
_.-- |(\\ \ .'_.'
_.-' \_\\ \\_),/ _/
_).' .:::::::.___ .'
// ' ./::::::\\o\(
// //::/ '"( \
//_ //::( '. '.
/_'/ /||:::\ '. \
'// '\\:::':\_ -<_' _'-
/ | '\::/|::::.._ _ )(
| | \:| \:( '.(_'._)
| | \( \::. '-)
\ \ . '""""---.
\ \ \ . _.-...)
\ \/\. \:.___.-'..:::/
\ |\\:..\:::::'.::::/
' '.:::::'..:::"'
'":::""'

2
uc.c
View file

@ -284,7 +284,7 @@ uc_err uc_close(uch *handle)
free(uc->hook_callbacks); free(uc->hook_callbacks);
free(uc->memory_map); free(uc->mapped_blocks);
// finally, free uc itself. // finally, free uc itself.
memset(uc, 0, sizeof(*uc)); memset(uc, 0, sizeof(*uc));