com php-src: pefree() these (with persistent=0), as internally in zend_multibyte.c they do the s ame, and at the same time also cast them to void
pointers to silence the compiler warnings .: ext/exif/exif.c

From: Date: Fri, 05 Aug 2016 09:17:26 +0000
Subject: com php-src: pefree() these (with persistent=0), as internally in zend_multibyte.c they do the s ame, and at the same time also cast them to void
pointers to silence the compiler warnings .: ext/exif/exif.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93636@lists.php.net to get a copy of this message
Commit: 5db7f1ea7e74ca9b561f51203299a2220f31d7ed Author: Kalle Sommer Nielsen <kalle@php.net> Fri, 5 Aug 2016 11:17:26 +0200 Parents: b3124dbe12915762b51bfab62d5cbbe83ad52724 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5db7f1ea7e74ca9b561f51203299a2220f31d7ed Log: pefree() these (with persistent=0), as internally in zend_multibyte.c they do the same, and at the same time also cast them to void pointers to silence the compiler warnings. Changed paths: M ext/exif/exif.c Diff: diff --git a/ext/exif/exif.c b/ext/exif/exif.c index d5271e7..cd924ee 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -171,7 +171,7 @@ ZEND_INI_MH(OnUpdateEncode) php_error_docref(NULL, E_WARNING, "Illegal encoding ignored: '%s'", ZSTR_VAL(new_value)); return FAILURE; } - efree(return_list); + pefree((void *) return_list, 0); } return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); } @@ -186,7 +186,7 @@ ZEND_INI_MH(OnUpdateDecode) php_error_docref(NULL, E_WARNING, "Illegal encoding ignored: '%s'", ZSTR_VAL(new_value)); return FAILURE; } - efree(return_list); + pefree((void *) return_list, 0); } return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); }

« previous php.cvs (#93636) next »