Merge branch 'PHP-5.6' into PHP-7.0

Conflicts: Zend/zend_ini_scanner.c
xuenru · Oct 20, 2015 · c7cb403 · c7cb403
2 parents 131a348 + d5f76ca
commit c7cb403
Show file tree

Hide file tree

Showing 3 changed files with 3,622 additions and 20 deletions.
diff --git a/Zend/tests/bug70748.phpt b/Zend/tests/bug70748.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
+--FILE--
+<?php
+$ini = '[${ 	';
+
+$ini_file = __DIR__ . "/bug70748.ini";
+
+file_put_contents($ini_file, $ini);
+
+var_dump(parse_ini_file($ini_file));
+?>
+--CLEAN--
+<?php
+unlink(__DIR__ . "bug70748.ini");
+?>
+--EXPECTF--
+Warning: syntax error, unexpected $end, expecting '}' in %sbug70748.ini on line %d
+ in %sbug70748.php on line %d
+bool(false)