com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_string.h ext/standard/var_unserializer.c
ext/standard/var_unserializer.re

From: Date: Wed, 17 Dec 2014 04:29:36 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_string.h ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83773@lists.php.net to get a copy of this message
Commit: 4acc56d5b2378b2296b94690a545af67f6775e5a Author: Anatol Belski <ab@php.net> Wed, 17 Dec 2014 05:29:36 +0100 Parents: 2eef2abee5e89e77c88a9c5732bc95fab27d3404 cf84bf53ea13ef70dd6145a743e093b0d3156332 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4acc56d5b2378b2296b94690a545af67f6775e5a Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: fix unserializer patch move this entry to the correct version add missing NEWS entry add missing NEWS entry Updated or skipped certain 32-bit tests add NEWS entry for #68594 5.4.37 add more BC breaks update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Fix typo Hash value must not zero? Bugs: https://bugs.php.net/68594 Changed paths: MM Zend/zend_string.h MM ext/standard/var_unserializer.c MM ext/standard/var_unserializer.re Diff: diff --cc ext/standard/var_unserializer.c index 74a86ca,a6d3f91..bcd00a6 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -620,13 -612,13 +612,13 @@@ yy13 goto yy3; yy14: ++YYCURSOR; - #line 860 "ext/standard/var_unserializer.re" + #line 852 "ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); + php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } - #line 630 "ext/standard/var_unserializer.c" + #line 622 "ext/standard/var_unserializer.c" yy16: yych = *++YYCURSOR; goto yy3;

« previous php.cvs (#83773) next »