diff options
Diffstat (limited to 'CVE-2014-8142.patch')
| -rw-r--r-- | CVE-2014-8142.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/CVE-2014-8142.patch b/CVE-2014-8142.patch deleted file mode 100644 index c4ebeb55b69c..000000000000 --- a/CVE-2014-8142.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 630f9c33c23639de85c3fd306b209b538b73b4c9 Mon Sep 17 00:00:00 2001 -From: Stanislav Malyshev <stas@php.net> -Date: Thu, 11 Dec 2014 19:28:32 -0800 -Subject: [PATCH] Fix bug #68594 - Use after free vulnerability in - unserialize() - ---- - NEWS | 2 + - ext/standard/tests/serialize/bug68594.phpt | 23 ++++++++++ - ext/standard/var_unserializer.c | 68 ++++++++++++++++-------------- - ext/standard/var_unserializer.re | 3 ++ - 4 files changed, 64 insertions(+), 32 deletions(-) - create mode 100644 ext/standard/tests/serialize/bug68594.phpt - -Index: php5-5.3.10/ext/standard/tests/serialize/bug68594.phpt -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ php5-5.3.10/ext/standard/tests/serialize/bug68594.phpt 2015-02-13 11:27:34.753347966 -0500 -@@ -0,0 +1,23 @@ -+--TEST-- -+Bug #68545 Use after free vulnerability in unserialize() -+--FILE-- -+<?php -+for ($i=4; $i<100; $i++) { -+ $m = new StdClass(); -+ -+ $u = array(1); -+ -+ $m->aaa = array(1,2,&$u,4,5); -+ $m->bbb = 1; -+ $m->ccc = &$u; -+ $m->ddd = str_repeat("A", $i); -+ -+ $z = serialize($m); -+ $z = str_replace("bbb", "aaa", $z); -+ $y = unserialize($z); -+ $z = serialize($y); -+} -+?> -+===DONE=== -+--EXPECTF-- -+===DONE=== -Index: php5-5.3.10/ext/standard/var_unserializer.c -=================================================================== ---- php5-5.3.10.orig/ext/standard/var_unserializer.c 2015-02-13 11:27:34.793348294 -0500 -+++ php5-5.3.10/ext/standard/var_unserializer.c 2015-02-13 11:27:34.753347966 -0500 -@@ -298,6 +298,9 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -+ if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ var_push_dtor(var_hash, old_data); -+ } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); - } -Index: php5-5.3.10/ext/standard/var_unserializer.re -=================================================================== ---- php5-5.3.10.orig/ext/standard/var_unserializer.re 2015-02-13 11:27:34.793348294 -0500 -+++ php5-5.3.10/ext/standard/var_unserializer.re 2015-02-13 11:27:34.753347966 -0500 -@@ -304,6 +304,9 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -+ if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ var_push_dtor(var_hash, old_data); -+ } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); - } |