Merge branch 'master' of https://github.com/php/php-src into accessors

nikic · Dec 30, 2012 · 64699ee · 64699ee
2 parents 20822c5 + ae5d862
commit 64699ee
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
@@ -186,7 +186,6 @@ ZEND_API void zend_strip(TSRMLS_D)
 
 			case T_END_HEREDOC:
 				zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
-				efree(token.value.str.val);
 				/* read the following character, either newline or ; */
 				if (lex_scan(&token TSRMLS_CC) != T_WHITESPACE) {
 					zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
@@ -80,6 +80,11 @@ static int php_filter_parse_int(const char *str, unsigned int str_len, long *ret
 			break;
 	}
 
+	if (*str == '0' && str + 1 == end) {
+		/* Special cases: +0 and -0 */
+		return 1;
+	}
+
 	/* must start with 1..9*/
 	if (str < end && *str >= '1' && *str <= '9') {
 		ctx_value = ((sign)?-1:1) * ((*(str++)) - '0');

diff --git a/ext/filter/tests/filter_data.phpt b/ext/filter/tests/filter_data.phpt
@@ -10,9 +10,13 @@ precision=14
 /* Integer */
 $data = "-123";   var_dump(filter_var($data, FILTER_VALIDATE_INT));
 $data = "0";      var_dump(filter_var($data, FILTER_VALIDATE_INT));
+$data = "-0";     var_dump(filter_var($data, FILTER_VALIDATE_INT));
+$data = "+0";     var_dump(filter_var($data, FILTER_VALIDATE_INT));
 $data = "123";    var_dump(filter_var($data, FILTER_VALIDATE_INT));
 $data = -123;     var_dump(filter_var($data, FILTER_VALIDATE_INT));
 $data = 0;        var_dump(filter_var($data, FILTER_VALIDATE_INT));
+$data = -0;        var_dump(filter_var($data, FILTER_VALIDATE_INT));
+$data = +0;        var_dump(filter_var($data, FILTER_VALIDATE_INT));
 $data = 123;      var_dump(filter_var($data, FILTER_VALIDATE_INT));
 $data = "";       var_dump(filter_var($data, FILTER_VALIDATE_INT));
 echo "\n";
@@ -46,9 +50,13 @@ $data = "";       var_dump(filter_var($data, FILTER_VALIDATE_BOOLEAN));
 --EXPECT--
 int(-123)
 int(0)
+int(0)
+int(0)
 int(123)
 int(-123)
 int(0)
+int(0)
+int(0)
 int(123)
 bool(false)
 

diff --git a/ext/standard/tests/strings/bug63874.phpt b/ext/standard/tests/strings/bug63874.phpt
@@ -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;
+?>