diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2015-11-02 18:00:20 -0500 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2015-11-02 18:35:18 -0500 |
| commit | d9454b5d1c5a22855e7c22f30644ba7c8980f923 (patch) | |
| tree | 2875db1a30974af5886d8b9ba978021c1c177a0e /dev-lang/php/files | |
| parent | version bump (diff) | |
| download | gentoo-d9454b5d1c5a22855e7c22f30644ba7c8980f923.tar.gz gentoo-d9454b5d1c5a22855e7c22f30644ba7c8980f923.tar.bz2 gentoo-d9454b5d1c5a22855e7c22f30644ba7c8980f923.zip | |
dev-lang/php: revbump php-5.6.15 to fix a segfault.
The segfault issue was reported in bug #564690 by Zoltán
Halassy. There is an upstream fix that we've added as a patch. The
problem/fix have both been confirmed.
Since this requires a revbump, the sys-libs/db dependency has been
fixed along with it according to bug #521222. It still remains to
address that issue for the php-7.x series.
Gentoo-Bug: 521222
Gentoo-Bug: 564690
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'dev-lang/php/files')
| -rw-r--r-- | dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch new file mode 100644 index 000000000000..29876a9f97f6 --- /dev/null +++ b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch @@ -0,0 +1,59 @@ +From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001 +From: Xinchen Hui <laruence@gmail.com> +Date: Mon, 2 Nov 2015 10:47:02 +0800 +Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when + referencing a non-existent constant) + +--- + NEWS | 2 ++ + Zend/tests/bug70828.phpt | 24 ++++++++++++++++++++++++ + Zend/zend_compile.c | 2 +- + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 Zend/tests/bug70828.phpt + +diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt +new file mode 100644 +index 0000000..dd285b5 +--- /dev/null ++++ b/Zend/tests/bug70828.phpt +@@ -0,0 +1,24 @@ ++--TEST-- ++Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant) ++--FILE-- ++<?php ++ ++namespace test { ++ use const nonexistent; ++ ++ class test { ++ static function run(){ ++ var_dump(nonexistent); ++ existent; ++ } ++ } ++} ++ ++namespace { ++ define("test\\existent", "bug!", 1); ++ test\test::run(); ++} ++?> ++--EXPECTF-- ++Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in /home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8 ++string(11) "nonexistent" +diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c +index 5ff1b04..fca4e2a 100644 +--- a/Zend/zend_compile.c ++++ b/Zend/zend_compile.c +@@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con + opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC); + } else { + opline->extended_value = IS_CONSTANT_UNQUALIFIED; +- if (CG(current_namespace)) { ++ if (check_namespace && CG(current_namespace)) { + opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; + opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC); + } else { +-- +2.1.4 + |