From d8ad2f4695ebd6dc2d4e668d9baeac1c071791a6 Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 25 Dec 2019 13:14:08 +0800
Subject: Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter)

---
 ext/xmlwriter/tests/bug79029.phpt   | 32 ++++++++++++++++++++++++++++++++
 ext/xmlwriter/tests/bug79029_1.phpt | 13 -------------
 2 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 ext/xmlwriter/tests/bug79029.phpt
 delete mode 100644 ext/xmlwriter/tests/bug79029_1.phpt

(limited to 'ext/xmlwriter')

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
-- 
cgit v1.2.1