From fb58e69a84f4fde603a630d2c9df2fa3be16d846 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 20 May 2013 00:52:38 -0700 Subject: [PATCH] fix bug #64660 - yyparse can return 2, not only 1 --- NEWS | 6 ++++-- Zend/tests/bug64660.phpt | 11 +++++++++++ Zend/zend_language_scanner.c | 6 +++--- Zend/zend_language_scanner.l | 4 ++-- 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 Zend/tests/bug64660.phpt diff --git a/NEWS b/NEWS index c7aff7f2af3..2dc8815f4d3 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ PHP NEWS - Core: . Fixed bug #64729 (compilation failure on x32). (Gustavo) + . Fixed bug #64660 (Segfault on memory exhaustion within function definition). + (Stas) . Fixed bug #64853 (Use of no longer available ini directives causes crash on TS build). (Anatol) @@ -18,12 +20,12 @@ PHP NEWS - SNMP: . Fixed bug #64765 (Some IPv6 addresses get interpreted wrong). - (Boris Lytochkin) + (Boris Lytochkin) . Fixed bug #64159 (Truncated snmpget). (Boris Lytochkin) - Zend Engine: . Fixed bug #64821 (Custom Exceptions crash when internal properties overridden). - (Anatol) + (Anatol) 09 May 2013, PHP 5.4.15 - Core: diff --git a/Zend/tests/bug64660.phpt b/Zend/tests/bug64660.phpt new file mode 100644 index 00000000000..e2b89da1cdd --- /dev/null +++ b/Zend/tests/bug64660.phpt @@ -0,0 +1,11 @@ +--TEST-- +Bug #64660 (Segfault on memory exhaustion within function definition) +--FILE-- +