archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)

Browse source 
T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c
Bugfix by Nikita for bug #60097
This commit is contained in:
Pierrick Charron 2012-12-29 23:11:37 -05:00
parent f8a9a47e8c
commit 8228597ecc
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -3,6 +3,7 @@ PHP NEWS
?? ??? 201?, PHP 5.5.0 Alpha 3 ?? ??? 201?, PHP 5.5.0 Alpha 3
- General improvements: - General improvements:
. Fixed bug #63874 (Segfault if php_strip_whitespace has heredoc). (Pierrick)
. Fixed bug #63822 (Crash when using closures with ArrayAccess). . Fixed bug #63822 (Crash when using closures with ArrayAccess).
(Nikita Popov) (Nikita Popov)
. Add Generator::throw() method. (Nikita Popov) . Add Generator::throw() method. (Nikita Popov)

1
Zend/zend_highlight.c
View file

@ -186,7 +186,6 @@ ZEND_API void zend_strip(TSRMLS_D)
case T_END_HEREDOC: case T_END_HEREDOC:
zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng)); zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
efree(token.value.str.val);
/* read the following character, either newline or ; */ /* read the following character, either newline or ; */
if (lex_scan(&token TSRMLS_CC) != T_WHITESPACE) { if (lex_scan(&token TSRMLS_CC) != T_WHITESPACE) {
zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng)); zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));

16
ext/standard/tests/strings/bug63874.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
Bug #63874 (Segfault if php_strip_whitespace has heredoc)
--FILE--
<?php
echo php_strip_whitespace(__FILE__);
return <<<A
a
A;
?>
--EXPECT--
<?php
echo php_strip_whitespace(__FILE__); return <<<A
a
A;
?>