diff options
| author | Xinchen Hui <laruence@gmail.com> | 2019-12-25 16:29:30 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2019-12-25 16:29:30 +0800 |
| commit | ce4d80a85a1355dbfbc0f1b1dc005e54bfc28130 (patch) | |
| tree | ab7d0d97ca8879d6c19a381cbaece7bf4781b67c /ext/xmlwriter | |
| parent | 66a591aebe9c76d6703435426131c2494c3b25d0 (diff) | |
| parent | e36daa6927c05d2e687bb77495ef206cde118b33 (diff) | |
| download | php-git-ce4d80a85a1355dbfbc0f1b1dc005e54bfc28130.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
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, 32 insertions, 13 deletions
diff --git a/ext/xmlwriter/tests/bug79029.phpt b/ext/xmlwriter/tests/bug79029.phpt new file mode 100644 index 0000000000..f329b62756 --- /dev/null +++ b/ext/xmlwriter/tests/bug79029.phpt @@ -0,0 +1,32 @@ +--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 deleted file mode 100644 index c91295c167..0000000000 --- a/ext/xmlwriter/tests/bug79029_1.phpt +++ /dev/null @@ -1,13 +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("a"); -$x[0]->startComment(); -?> -okey ---EXPECT-- -okey |