com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/dba/libinifile/inifile.c

Commit: 433976f93116909007b44b64f25121cec42e3a35 Author: Christoph M. Becker <cmbecker69@gmx.de> Thu, 25 Aug 2016 18:19:43 +0200 Parents: 51d19c12a5eaad5d952e60259a82d8726f3f30bc 84512a117789563a64172115c648944538006a69 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=433976f93116909007b44b64f25121cec42e3a35 Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM NEWS MM ext/dba/libinifile/inifile.c Diff: diff --cc NEWS index c2c6e2d,a7a58b6..630b1c6 --- a/NEWS +++ b/NEWS @@@ -1,19 -1,20 +1,23 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2016, PHP 5.6.26 +?? ??? 2016 PHP 7.0.11 - Core: - . Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer - (zend_gc.c:260)). (Laruence) + . Fixed bug #72911 (Memleak in zend_binary_assign_op_obj_helper). (Laruence) + . Fixed bug #72813 (Segfault with __get returned by ref). (Laruence) + . Fixed bug #72767 (PHP Segfaults when trying to expand an infinite operator). + (Nikita) + . Fixed bug #72854 (PHP Crashes on duplicate destructor call). (Nikita) + . Fixed bug #72857 (stream_socket_recvfrom read access violation). (Anatol) + +- COM: + . Fixed bug #72922 (COM called from PHP does not return out parameters).. + (Anatol) + - Dba: - . Fixed bug #71514 (Bad dba_replace condition because of wrong API usage). - (cmb) + . Fixed bug #70825 (Cannot fetch multiple values with group in ini file). + (cmb) + -- Streams: - . Fixed bug #72853 (stream_set_blocking doesn't work). (Laruence) - - FTP: . Fixed bug #70195 (Cannot upload file using ftp_put to FTPES with require_ssl_reuse). (Benedict Singer) diff --cc ext/dba/libinifile/inifile.c index f5b5ea2,95ac9a8..8572519 --- a/ext/dba/libinifile/inifile.c +++ b/ext/dba/libinifile/inifile.c @@@ -247,9 -247,10 +247,10 @@@ val_type inifile_fetch(inifile *dba, co val_type val; int res, grp_eq = 0; - if (skip == -1 && dba->next.key.group && dba->next.key.name && !inifile_key_cmp(&dba->next.key, key TSRMLS_CC)) { + if (skip == -1 && dba->next.key.group && dba->next.key.name && !inifile_key_cmp(&dba->next.key, key)) { /* we got position already from last fetch */ php_stream_seek(dba->fp, dba->next.pos, SEEK_SET); + ln.key.group = estrdup(dba->next.key.group); } else { /* specific instance or not same key -> restart search */ /* the slow way: restart and seacrch */