From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 25 Dec 2019 11:05:44 +0000 (+0100)
Subject: Fix test case
X-Git-Tag: php-7.4.7RC1~382
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2704ee6844c03348de9d15e74646d09007ef0f7c;p=php

Fix test case

As of PHP 7.3.0, unlinking files with open handles is possible on
Windows, but these file entries are still blocked until all open
handles are closed.  Since this test doesn't require to write to the
same file, we use three separate files.

We also add the missing skip check for XMLReader.
---

diff --git a/ext/xmlwriter/tests/bug79029.phpt b/ext/xmlwriter/tests/bug79029.phpt
index f329b62756..2e76a4e409 100644
--- a/ext/xmlwriter/tests/bug79029.phpt
+++ b/ext/xmlwriter/tests/bug79029.phpt
@@ -1,29 +1,31 @@
 --TEST--
 #79029 (Use After Free's in XMLReader / XMLWriter)
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php 
+if (!extension_loaded("xmlwriter")) print "skip xmlwriter extension not available";
+if (!extension_loaded("xmlreader")) print "skip xmlreader extension not available";
+?>
 --FILE--
 <?php
 $x = array( new XMLWriter() );
-$x[0]->openUri("bug79029.txt");
+$x[0]->openUri("bug79029_1.txt");
 $x[0]->startComment();
-@unlink("bug79029.txt");
 
 $x = new XMLWriter();
-$x->openUri("bug79029.txt");
+$x->openUri("bug79029_2.txt");
 fclose(@end(get_resources()));
-@unlink("bug79029.txt");
 
-file_put_contents("bug79029.txt", "a");
+file_put_contents("bug79029_3.txt", "a");
 $x = new XMLReader();
-$x->open("bug79029.txt");
+$x->open("bug79029_3.txt");
 fclose(@end(get_resources()));
-@unlink("bug79029.txt");
 ?>
 okey
 --CLEAN--
 <?php
-@unlink("bug79029.txt");
+@unlink("bug79029_1.txt");
+@unlink("bug79029_2.txt");
+@unlink("bug79029_3.txt");
 ?>
 --EXPECTF--
 Warning: fclose(): %d is not a valid stream resource in %sbug79029.php on line %d