diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-07-02 17:28:45 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-07-02 17:29:32 +0200 |
| commit | 09bb2527e96bcefa79ae5d5d93038f2a0cc80d0a (patch) | |
| tree | c19721a3c63f378a4bc66113a41188bf992ed03c /ext/standard/tests | |
| parent | 26a33a96fa5a85bcc74e33c1b8103d3841e11bad (diff) | |
| parent | c793885b7624be4e2a95c69a2b8b3fee969b312f (diff) | |
| download | php-git-09bb2527e96bcefa79ae5d5d93038f2a0cc80d0a.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'ext/standard/tests')
| -rw-r--r-- | ext/standard/tests/serialize/bug71311.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/serialize/bug73341.phpt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/tests/serialize/bug71311.phpt b/ext/standard/tests/serialize/bug71311.phpt index 3c70783d37..70267c5b0b 100644 --- a/ext/standard/tests/serialize/bug71311.phpt +++ b/ext/standard/tests/serialize/bug71311.phpt @@ -2,7 +2,7 @@ Bug #71311 Use-after-free vulnerability in SPL(ArrayObject, unserialize) --FILE-- <?php -$data = unserialize("C:11:\"ArrayObject\":11:{x:i:0;r:3;XX"); +$data = unserialize("C:11:\"ArrayObject\":11:{x:i:0;r:3;X}"); var_dump($data); ?> --EXPECTF-- diff --git a/ext/standard/tests/serialize/bug73341.phpt b/ext/standard/tests/serialize/bug73341.phpt index 55423217c3..86fd457c60 100644 --- a/ext/standard/tests/serialize/bug73341.phpt +++ b/ext/standard/tests/serialize/bug73341.phpt @@ -3,7 +3,7 @@ Bug #73144 (Use-afte-free in ArrayObject Deserialization) --FILE-- <?php try { -$token = 'a:2:{i:0;O:1:"0":2:0s:1:"0";i:0;s:1:"0";a:1:{i:0;C:11:"ArrayObject":7:0x:i:0;r0'; +$token = 'a:2:{i:0;O:1:"0":2:0s:1:"0";i:0;s:1:"0";a:1:{i:0;C:11:"ArrayObject":7:{x:i:0;r}'; $obj = unserialize($token); } catch(Exception $e) { echo $e->getMessage()."\n"; @@ -21,4 +21,4 @@ unserialize($exploit); Error at offset 6 of 7 bytes Notice: ArrayObject::unserialize(): Unexpected end of serialized data in %sbug73341.php on line %d -Error at offset 24 of 34 bytes
\ No newline at end of file +Error at offset 24 of 34 bytes |