diff options
| author | Xinchen Hui <laruence@gmail.com> | 2019-12-25 15:28:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2019-12-25 15:28:13 +0800 |
| commit | 66a591aebe9c76d6703435426131c2494c3b25d0 (patch) | |
| tree | ff88af076e40a22102d5d62745f8ae1ed86975cf /ext/xmlwriter | |
| parent | 24ccbb00573445b0df5e940a77e7363ace3c31f3 (diff) | |
| parent | 4c6e170c576ca92b7015eabe4ea6ac32383639d6 (diff) | |
| download | php-git-66a591aebe9c76d6703435426131c2494c3b25d0.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter)"
Diffstat (limited to 'ext/xmlwriter')
| -rw-r--r-- | ext/xmlwriter/tests/bug79029.phpt | 32 | ||||
| -rw-r--r-- | ext/xmlwriter/tests/bug79029_1.phpt | 13 |
2 files changed, 13 insertions, 32 deletions
diff --git a/ext/xmlwriter/tests/bug79029.phpt b/ext/xmlwriter/tests/bug79029.phpt deleted file mode 100644 index f329b62756..0000000000 --- a/ext/xmlwriter/tests/bug79029.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -#79029 (Use After Free's in XMLReader / XMLWriter) ---SKIPIF-- -<?php if (!extension_loaded("xmlwriter")) print "skip"; ?> ---FILE-- -<?php -$x = array( new XMLWriter() ); -$x[0]->openUri("bug79029.txt"); -$x[0]->startComment(); -@unlink("bug79029.txt"); - -$x = new XMLWriter(); -$x->openUri("bug79029.txt"); -fclose(@end(get_resources())); -@unlink("bug79029.txt"); - -file_put_contents("bug79029.txt", "a"); -$x = new XMLReader(); -$x->open("bug79029.txt"); -fclose(@end(get_resources())); -@unlink("bug79029.txt"); -?> -okey ---CLEAN-- -<?php -@unlink("bug79029.txt"); -?> ---EXPECTF-- -Warning: fclose(): %d is not a valid stream resource in %sbug79029.php on line %d - -Warning: fclose(): %d is not a valid stream resource in %sbug79029.php on line %d -okey diff --git a/ext/xmlwriter/tests/bug79029_1.phpt b/ext/xmlwriter/tests/bug79029_1.phpt new file mode 100644 index 0000000000..c91295c167 --- /dev/null +++ b/ext/xmlwriter/tests/bug79029_1.phpt @@ -0,0 +1,13 @@ +--TEST-- +#79029 (Use After Free's in XMLReader / XMLWriter) +--SKIPIF-- +<?php if (!extension_loaded("xmlwriter")) print "skip"; ?> +--FILE-- +<?php +$x = array( new XMLWriter() ); +$x[0]->openUri("a"); +$x[0]->startComment(); +?> +okey +--EXPECT-- +okey |