diff options
| author | Anatol Belski <ab@php.net> | 2015-02-08 14:13:39 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-08 14:13:39 +0100 |
| commit | ce9f52adcdfb19f70dc4274f3587e58ac07995bd (patch) | |
| tree | 23e07371af169522870988c540c9990406ae77d5 | |
| parent | b32458f0c974494b1cbb6981dbab24f75d98a236 (diff) | |
| parent | 979020fcaddaed341c9159e9cac0c30436fa0ea9 (diff) | |
| download | php-git-ce9f52adcdfb19f70dc4274f3587e58ac07995bd.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
moved the part of the test into an appropriate place
| -rw-r--r-- | ext/fileinfo/tests/bug68996.phpt | 22 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug68996.phpt | 10 |
2 files changed, 24 insertions, 8 deletions
diff --git a/ext/fileinfo/tests/bug68996.phpt b/ext/fileinfo/tests/bug68996.phpt new file mode 100644 index 0000000000..9fa2190307 --- /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 af40274983..ce11b3ee47 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 /> + |