summarylogtreecommitdiffstats
path: root/CVE-2015-0231.patch
diff options
context:
space:
mode:
Diffstat (limited to 'CVE-2015-0231.patch')
-rw-r--r--CVE-2015-0231.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/CVE-2015-0231.patch b/CVE-2015-0231.patch
deleted file mode 100644
index 99b15d19e3ec..000000000000
--- a/CVE-2015-0231.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From b585a3aed7880a5fa5c18e2b838fc96f40e075bd Mon Sep 17 00:00:00 2001
-From: Stanislav Malyshev <stas@php.net>
-Date: Thu, 1 Jan 2015 16:19:05 -0800
-Subject: [PATCH] Fix for bug #68710 (Use After Free Vulnerability in PHP's
- unserialize())
-
----
- NEWS | 4 ++++
- ext/standard/tests/strings/bug68710.phpt | 25 +++++++++++++++++++++++++
- ext/standard/var_unserializer.c | 4 ++--
- ext/standard/var_unserializer.re | 2 +-
- 4 files changed, 32 insertions(+), 3 deletions(-)
- create mode 100644 ext/standard/tests/strings/bug68710.phpt
-
-Index: php5-5.3.10/ext/standard/tests/strings/bug68710.phpt
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ php5-5.3.10/ext/standard/tests/strings/bug68710.phpt 2015-02-13 11:36:32.969760122 -0500
-@@ -0,0 +1,25 @@
-+--TEST--
-+Bug #68710 Use after free vulnerability in unserialize() (bypassing the
-+CVE-2014-8142 fix)
-+--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("aaa", "123", $z);
-+ $z = str_replace("bbb", "123", $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:36:33.009760449 -0500
-+++ php5-5.3.10/ext/standard/var_unserializer.c 2015-02-13 11:36:32.969760122 -0500
-@@ -298,7 +298,7 @@
- } 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) {
-+ if (zend_hash_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,
-Index: php5-5.3.10/ext/standard/var_unserializer.re
-===================================================================
---- php5-5.3.10.orig/ext/standard/var_unserializer.re 2015-02-13 11:36:33.009760449 -0500
-+++ php5-5.3.10/ext/standard/var_unserializer.re 2015-02-13 11:36:32.969760122 -0500
-@@ -304,7 +304,7 @@
- } 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) {
-+ if (zend_hash_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,