com php-src: moved the part of the test into an appropriate place: ext/fileinfo/tests/bug68996.phpt ext/standard/tests/strings/bug68996.phpt
| From: | Anatol Belski | Date: | Sun, 08 Feb 2015 13:10:52 +0000 |
| Subject: | com php-src: moved the part of the test into an appropriate place: ext/fileinfo/tests/bug68996.phpt ext/standard/tests/strings/bug68996.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84703@lists.php.net to get a copy of this message | ||
Commit: 979020fcaddaed341c9159e9cac0c30436fa0ea9
Author: Anatol Belski <ab@php.net> Sun, 8 Feb 2015 14:10:52 +0100
Parents: ffdc2c4123f2c4c67d3140667862177a7bceb90e
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=979020fcaddaed341c9159e9cac0c30436fa0ea9
Log:
moved the part of the test into an appropriate place
Changed paths:
A ext/fileinfo/tests/bug68996.phpt
M ext/standard/tests/strings/bug68996.phpt
Diff:
diff --git a/ext/fileinfo/tests/bug68996.phpt b/ext/fileinfo/tests/bug68996.phpt
new file mode 100644
index 0000000..9fa2190
--- /dev/null
+++ b/ext/fileinfo/tests/bug68996.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #68996 (Invalid free of CG(interned_empty_string))
+--SKIPIF--
+<?php
+if (getenv("USE_ZEND_ALLOC") !== "0") {
+ print "skip Need Zend MM disabled";
+}
+?>
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--INI--
+html_errors=1
+--FILE--
+<?php
+finfo_open(FILEINFO_MIME_TYPE, "\xfc\x63");
+?>
+--EXPECTF--
+<br />
+<b>Warning</b>: : failed to open stream: No such file or directory in
<b>%sbug68996.php</b> on line <b>%d</b><br />
+<br />
+<b>Warning</b>: : failed to open stream: No such file or directory in
<b>%sbug68996.php</b> on line <b>%d</b><br />
+<br />
+<b>Warning</b>: finfo_open(): in <b>%sbug68996.php</b> on line
<b>%d</b><br />
diff --git a/ext/standard/tests/strings/bug68996.phpt b/ext/standard/tests/strings/bug68996.phpt
index af40274..ce11b3e 100644
--- a/ext/standard/tests/strings/bug68996.phpt
+++ b/ext/standard/tests/strings/bug68996.phpt
@@ -10,14 +10,8 @@ html_errors=1
--FILE--
<?php
fopen("\xfc\x63", "r");
-finfo_open(FILEINFO_MIME_TYPE, "\xfc\x63");
?>
--EXPECTF--
<br />
-<b>Warning</b>: : failed to open stream: No such file or directory in
<b>%sbug68996.php</b> on line <b>2</b><br />
-<br />
-<b>Warning</b>: : failed to open stream: No such file or directory in
<b>%sbug68996.php</b> on line <b>3</b><br />
-<br />
-<b>Warning</b>: : failed to open stream: No such file or directory in
<b>%sbug68996.php</b> on line <b>3</b><br />
-<br />
-<b>Warning</b>: finfo_open(): in <b>/%sbug68996.php</b> on line
<b>3</b><br />
+<b>Warning</b>: : failed to open stream: No such file or directory in
<b>%sbug68996.php</b> on line <b>%d</b><br />
+