File php-CVE-2016-9137.patch of Package php7.16129

Overview Repositories Revisions Requests Users Attributes Meta

File php-CVE-2016-9137.patch of Package php7.16129

ba141a8f Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Sun, 25 Sep 2016 19:53:59 -0700
Subject: [PATCH] Fix bug #73147: Use After Free in PHP7 unserialize()

(cherry picked from commit 0e6fe3a4c96be2d3e88389a5776f878021b4c59f)
---
 Zend/zend_API.c              | 18 ++++++++++++++++++
 Zend/zend_API.h              |  1 +
 ext/curl/curl_file.c         |  1 +
 ext/curl/tests/bug73147.phpt | 20 ++++++++++++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 ext/curl/tests/bug73147.phpt

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 81ab757..5270d7f 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3847,6 +3847,24 @@ ZEND_API void zend_update_property_null(zend_class_entry *scope, zval *object, c
 }
 /* }}} */
 
+ZEND_API void zend_unset_property(zend_class_entry *scope, zval *object, const char *name, size_t name_length) /* {{{ */
+{
+	zval property;
+	zend_class_entry *old_scope = EG(scope);
+
+	EG(scope) = scope;
+
+	if (!Z_OBJ_HT_P(object)->unset_property) {
+		zend_error_noreturn(E_CORE_ERROR, "Property %s of class %s cannot be unset", name, ZSTR_VAL(Z_OBJCE_P(object)->name));
+	}
+	ZVAL_STRINGL(&property, name, name_length);
+	Z_OBJ_HT_P(object)->unset_property(object, &property, 0);
+	zval_ptr_dtor(&property);
+
+	EG(scope) = old_scope;
+}
+/* }}} */
+
 ZEND_API void zend_update_property_bool(zend_class_entry *scope, zval *object, const char *name, size_t name_length, zend_long value) /* {{{ */
 {
 	zval tmp;
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 7fd7756..15d24ed 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -343,6 +343,7 @@ ZEND_API void zend_update_property_double(zend_class_entry *scope, zval *object,
 ZEND_API void zend_update_property_str(zend_class_entry *scope, zval *object, const char *name, size_t name_length, zend_string *value);
 ZEND_API void zend_update_property_string(zend_class_entry *scope, zval *object, const char *name, size_t name_length, const char *value);
 ZEND_API void zend_update_property_stringl(zend_class_entry *scope, zval *object, const char *name, size_t name_length, const char *value, size_t value_length);
+ZEND_API void zend_unset_property(zend_class_entry *scope, zval *object, const char *name, size_t name_length);
 
 ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *name, size_t name_length, zval *value);
 ZEND_API int zend_update_static_property_null(zend_class_entry *scope, const char *name, size_t name_length);
diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c
index de173a5..ba8a7de 100644
--- a/ext/curl/curl_file.c
+++ b/ext/curl/curl_file.c
@@ -137,6 +137,7 @@ ZEND_METHOD(CURLFile, setPostFilename)
    Unserialization handler */
 ZEND_METHOD(CURLFile, __wakeup)
 {
+	zend_unset_property(curl_CURLFile_class, getThis(), "name", sizeof("name")-1);
 	zend_update_property_string(curl_CURLFile_class, getThis(), "name", sizeof("name")-1, "");
 	zend_throw_exception(NULL, "Unserialization of CURLFile instances is not allowed", 0);
 }

Places

File php-CVE-2016-9137.patch of Package php7.16129

Places