From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 25 Sep 2019 08:56:27 +0000 (+0200)
Subject: Remove xfail on bug70219.phpt
X-Git-Tag: php-7.4.0RC3~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b100d51ba2668f9d3a051531575171a7184dc1c6;p=php

Remove xfail on bug70219.phpt

Looks like this is working as it's supposed to, the test expectation
just needs to be adjusted.
---

diff --git a/ext/standard/tests/serialize/bug70219.phpt b/ext/standard/tests/serialize/bug70219.phpt
index ddd2f317df..a97caf6c2b 100644
--- a/ext/standard/tests/serialize/bug70219.phpt
+++ b/ext/standard/tests/serialize/bug70219.phpt
@@ -4,8 +4,6 @@ Bug #70219 Use after free vulnerability in session deserializer
 <?php
 if (!extension_loaded('session')) die('skip session extension not available');
 ?>
---XFAIL--
-Unfinished merge, needs fix.
 --FILE--
 <?php
 class obj implements Serializable {
@@ -32,15 +30,6 @@ var_dump($data);
 ?>
 --EXPECTF--
 Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d
-array(2) {
-  [0]=>
-  object(obj)#%d (1) {
-    ["data"]=>
-    NULL
-  }
-  [1]=>
-  &array(1) {
-    ["data"]=>
-    NULL
-  }
-}
+
+Notice: unserialize(): Error at offset 55 of 56 bytes in %s on line %d
+bool(false)