[PHP-CVS] com php-src: Fixed bug #64960 (Segfault in gc_zval_possible_root): NEWS Zend/tests/bug64960.phpt Zend/zend_execute_API.c
Commit:3c87945c95c9c31986e690bb046c70e58c8d8896
Author:Xinchen Hui larue...@php.net Wed, 5 Jun 2013 17:25:00 +0800
Parents: 93e0d78ec655f59ebfa82b2c6f8486c43651c1d0
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=3c87945c95c9c31986e690bb046c70e58c8d8896
Log:
Fixed bug #64960 (Segfault in gc_zval_possible_root)
Bugs:
https://bugs.php.net/64960
Changed paths:
M NEWS
A Zend/tests/bug64960.phpt
M Zend/zend_execute_API.c
Diff:
diff --git a/NEWS b/NEWS
index 60a4035..fbb470b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2013, PHP 5.3.27
+- Core:
+ . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence)
- PDO_firebird:
. Fixed bug #64037 (Firebird return wrong value for numeric field).
diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt
new file mode 100644
index 000..b31cca3
--- /dev/null
+++ b/Zend/tests/bug64960.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Bug #64960 (Segfault in gc_zval_possible_root)
+--FILE--
+?php
+// this makes ob_end_clean raise an error
+ob_end_flush();
+
+class ExceptionHandler {
+ public function __invoke (Exception $e)
+ {
+ // this triggers the custom error handler
+ ob_end_clean();
+ }
+}
+
+// this must be a class, closure does not trigger segfault
+set_exception_handler(new ExceptionHandler());
+
+// exception must be throwed from error handler.
+set_error_handler(function()
+{
+ $e = new Exception;
+ $e-_trace = debug_backtrace();
+
+ throw $e;
+});
+
+// trigger error handler
+$a['waa'];
+?
+--EXPECTF--
+Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete
or flush in %sbug64960.php on line 3
+
+Fatal error: Uncaught exception 'Exception' in %sbug64960.php:19
+Stack trace:
+#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array)
+#1 %sbug64960.php(9): ob_end_clean()
+#2 [internal function]: ExceptionHandler-__invoke(Object(Exception))
+#3 {main}
+ thrown in %sbug64960.php on line 19
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 9781889..687520d 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -263,15 +263,13 @@ void shutdown_executor(TSRMLS_D) /* {{{ */
if (EG(user_error_handler)) {
zeh = EG(user_error_handler);
EG(user_error_handler) = NULL;
- zval_dtor(zeh);
- FREE_ZVAL(zeh);
+ zval_ptr_dtor(zeh);
}
if (EG(user_exception_handler)) {
zeh = EG(user_exception_handler);
EG(user_exception_handler) = NULL;
- zval_dtor(zeh);
- FREE_ZVAL(zeh);
+ zval_ptr_dtor(zeh);
}
zend_stack_destroy(EG(user_error_handlers_error_reporting));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update NEWS: NEWS
Commit:3c93402f86bc0a0a9cdf87b480d8bb856e360059 Author:Xinchen Hui larue...@php.net Wed, 5 Jun 2013 17:29:04 +0800 Parents: f597f5561e658643d2f7f6e35c12b283760e1ac3 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3c93402f86bc0a0a9cdf87b480d8bb856e360059 Log: Update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 371ec37..9fd0f3f 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||| ?? ??? 2013, PHP 5.4.17 +- Core: + . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence) + - FPM: . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_execute_API.c
Commit:f597f5561e658643d2f7f6e35c12b283760e1ac3 Author:Xinchen Hui larue...@php.net Wed, 5 Jun 2013 17:26:10 +0800 Parents: efdeec3c0eb8e1bd9d14af37be6979fb46eda5df 3c87945c95c9c31986e690bb046c70e58c8d8896 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f597f5561e658643d2f7f6e35c12b283760e1ac3 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM Zend/zend_execute_API.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_execute_API.c
Commit:e89537f2a349d5d1f401e010ec6f17cff4035719 Author:Xinchen Hui larue...@php.net Wed, 5 Jun 2013 17:30:09 +0800 Parents: 785f4c5fc68422ae23c1acc37b823f214c52ca5d 3c93402f86bc0a0a9cdf87b480d8bb856e360059 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e89537f2a349d5d1f401e010ec6f17cff4035719 Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM Zend/zend_execute_API.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update NEWS: NEWS
Commit:7da648ff2f5c32d99e80fb3d712c2b95b19188c0 Author:Xinchen Hui larue...@php.net Wed, 5 Jun 2013 17:30:57 +0800 Parents: e89537f2a349d5d1f401e010ec6f17cff4035719 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7da648ff2f5c32d99e80fb3d712c2b95b19188c0 Log: Update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 1523cbc..7e6fcc3 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ PHP NEWS ?? ??? 2013, PHP 5.5.0 Release Candidate 3 - Core: + . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence) . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode, CVE 2013-2110). (Stas) @@ -10,8 +11,8 @@ PHP NEWS . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi) - GD: - . Fixed Bug #64961 (segfault in imagesetinterpolation). (Remi) . Fixed Bug #64962 (imagerotate produces corrupted image). (Remi) + . Fixed Bug #64961 (segfault in imagesetinterpolation). (Remi) - Hash: . Fixed Bug #64745 (hash_pbkdf2() truncates data when using default length -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add NEWS for PHP 5.3.26: NEWS
Commit:ec3bcbcb5a6336861951ad569e378e4b77984df5 Author:Johannes Schlüter johan...@php.net Wed, 5 Jun 2013 16:34:18 +0200 Parents: 3c87945c95c9c31986e690bb046c70e58c8d8896 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec3bcbcb5a6336861951ad569e378e4b77984df5 Log: Add NEWS for PHP 5.3.26 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index fbb470b..a7c0426 100644 --- a/NEWS +++ b/NEWS @@ -16,9 +16,7 @@ PHP NEWS - pgsql: - Fixed bug #64609 (pg_convert enum type support). (Matteo) -?? ??? 2013, PHP 5.3.26 - -### DO NOT ADD ENTRIES HERE, ADD THEM ABOVE FOR 5.3.27 ### +06 Jun 2013, PHP 5.3.26 - Core: . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.3.26
Tag php-5.3.26 in php-src.git was created Tag: edfecc21787880775bab25b4874aa5e864399744 Tagger: Johannes Schlüterjohan...@php.net Wed Jun 5 16:29:56 2013 +0200 Log: PHP 5.3.26 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRr0txAAoJEH3sTmn8nIPX6BkH/2RMVqCY1od5Ya4c8lpJZFRo UGESV/O9iaBGmfkncBWxjW/dpQQQvz0KchIdxn05uDjq6z7OTGFcS7qIE6vt6HWa b9HcAAJQ2S+Zt1MwXSWi3MM5Pg8HYMNmMg1L7B/hOdp1m0ht0G8F98M1vR01qORW QuV1/d7ARifCTJb99hzom5vk9YMa6qi1bh9Ws3EcAOtj/Y0Jt0ZZmoB9LS5Gvsf+ bbUQhdVzjokGFY7EQ+nCl6/1enifBjQwPp8PVeSeQZOmXvboS4Ix4x9afh1OVYXy IX8rUoNhIQebwVvSEqKve1WSwls5IpWI48zzYT7hLUo01YTz2HvW/fjj1inwd+g= =hNIW -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=edfecc21787880775bab25b4874aa5e864399744 Target: 4e573053dc625cc2a92917ab10511759bc19135e Author: Johannes Schlüter johan...@php.net Wed, 5 Jun 2013 16:29:25 +0200 Parents: 882aa9c687806d44f7e70555d7dfa125b507561e Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e573053dc625cc2a92917ab10511759bc19135e Target log: PHP 5.3.26 Changed paths: M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix NEWS: NEWS
Commit:882aa9c687806d44f7e70555d7dfa125b507561e Author:Johannes Schlüter johan...@php.net Wed, 5 Jun 2013 16:27:49 +0200 Parents: eeb7f93294cd0a11af44905d84044e0b158d802c Branches: PHP-5.3.26 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=882aa9c687806d44f7e70555d7dfa125b507561e Log: Fix NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 3b12678..a4ea43f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,10 @@ PHPNEWS ||| -23 May 2013, PHP 5.3.26RC1 +06 Jun 2013, PHP 5.3.26 + +- Core: + . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode, +CVE 2013-2110). (Stas) - Calendar: . Fixed bug #64895 (Integer overflow in SndToJewish). (Remi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.3.26: configure.in main/php_version.h
Commit:4e573053dc625cc2a92917ab10511759bc19135e Author:Johannes Schlüter johan...@php.net Wed, 5 Jun 2013 16:29:25 +0200 Parents: 882aa9c687806d44f7e70555d7dfa125b507561e Branches: PHP-5.3.26 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e573053dc625cc2a92917ab10511759bc19135e Log: PHP 5.3.26 Changed paths: M configure.in M main/php_version.h Diff: diff --git a/configure.in b/configure.in index 65ad742..192acee 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=26 -PHP_EXTRA_VERSION=RC1 +PHP_EXTRA_VERSION= PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 3033c1c..708ca7f 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 26 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.3.26RC1 +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.3.26 #define PHP_VERSION_ID 50326 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.5.0RC3
Tag php-5.5.0RC3 in php-src.git was created Tag: 83958f905d98d73c7e1e7ae85199e2b4b08f2471 Tagger: David Soria Parrad...@php.net Wed Jun 5 23:08:05 2013 +0200 Log: PHP 5.5.0 Relesae Canadidate 3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJRr6i9AAoJEME8cLhyZ7UtiOoP/3v2JzdOX5Q1Ruph5G697fGH ZiBN96VlWvkw2JqvU0nIajf3X0pjjBug9AVISl1uvrR/nV/jSbbwY8N/B2PRFAfw kSNglHSz08rSTXdk7ndW6mRzkguaUj4bGjC7pKZnJ93zzu/1SgKfTjVh+JPNQeRx sVIRir+ErLiqL5AI7Yp8qH9Im7H4xH5LG0lZpmWt6AS+VRjLqJcqJ8ki8Un2MDgX VV9ttL4GRFuLrIgcnE0speTlb5D80LLtB40wMRcS966quGI5wL+9I7bvt25BIHw8 e3AX3SlUxvXPQIuva5J1W0daJXwW3kNBWxevilYJedHC/l414T0m+9AeKX3LiB1Y kTp9FrMwYvMCIkzQzAZ65dFeju8LG6MlvWdCSQdfCvszG22bQ9hTb8Zr6dKUKg1R rWwc0fLdohiLS+pLKVuexb7r28vr7w8A1oVcTzawUVGcynINkEhOvbU5lfBKgBVq P9UsCnQ5zayeDAuSEjxLkcauGQkF5fPrCbhk4DMSKODyYJJ8SxhG3pxDjmrbPQpu Ab78hoVsddqmxQ6FfWPSM33sWs/DggWYqOfM8EU85UFYKmfmMB5oRzRFbpK8GGND U2jfPStyJjhwJs77fXILVeNeRwByMcbxShWxSdiy4Zf1J+7gQ1cZIyY7glbx74Mv J7Tgv/QIuAwDctxtnK9S =5NVn -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=83958f905d98d73c7e1e7ae85199e2b4b08f2471 Target: ed806fd89cf430c778d275514a53c5aff11646f0 Author: David Soria Parra d...@php.net Wed, 5 Jun 2013 23:07:40 +0200 Parents: aef5295756ee3dc8000faefca9b747e38be9 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed806fd89cf430c778d275514a53c5aff11646f0 Target log: PHP 5.5.0RC3 Changed paths: M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: News update: NEWS
Commit:c649186c3160cece3a410f7cf4df85a502821e7b Author:David Soria Parra d...@php.net Wed, 5 Jun 2013 23:08:48 +0200 Parents: aef5295756ee3dc8000faefca9b747e38be9 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c649186c3160cece3a410f7cf4df85a502821e7b Log: News update Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 75f26b4..430f826 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.5.0 Release Candidate 4 + 06 Jun 2013, PHP 5.5.0 Release Candidate 3 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.5.0RC3 NEWS: NEWS
Commit:aef5295756ee3dc8000faefca9b747e38be9 Author:David Soria Parra d...@php.net Wed, 5 Jun 2013 23:06:51 +0200 Parents: fdeefc466e020e0c3e1d3b585d913f3a88712053 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aef5295756ee3dc8000faefca9b747e38be9 Log: PHP 5.5.0RC3 NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 7e6fcc3..75f26b4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.0 Release Candidate 3 +06 Jun 2013, PHP 5.5.0 Release Candidate 3 - Core: . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
