|
 |
b74969 |
From 7b1898183032eeabc64a086ff040af991cebcd93 Mon Sep 17 00:00:00 2001
|
|
|
b74969 |
From: Stanislav Malyshev <stas@php.net>
|
|
|
b74969 |
Date: Sat, 31 Jan 2015 22:40:08 -0800
|
|
|
b74969 |
Subject: [PATCH] Fix bug #68942 (Use after free vulnerability in unserialize()
|
|
|
b74969 |
with DateTimeZone)
|
|
|
b74969 |
|
|
|
b74969 |
Conflicts:
|
|
|
b74969 |
ext/date/php_date.c
|
|
|
b74969 |
---
|
|
|
b74969 |
ext/date/php_date.c | 10 +++-------
|
|
|
b74969 |
ext/date/tests/bug68942_2.phpt | 9 +++++++++
|
|
|
b74969 |
2 files changed, 12 insertions(+), 7 deletions(-)
|
|
|
b74969 |
create mode 100644 ext/date/tests/bug68942_2.phpt
|
|
|
b74969 |
|
|
|
b74969 |
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
|
|
|
b74969 |
index 92e9480..08bfd08 100644
|
|
|
b74969 |
--- a/ext/date/php_date.c
|
|
|
b74969 |
+++ b/ext/date/php_date.c
|
|
|
b74969 |
@@ -2521,12 +2521,9 @@ static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht
|
|
|
b74969 |
timelib_tzinfo *tzi;
|
|
|
b74969 |
php_timezone_obj *tzobj;
|
|
|
b74969 |
|
|
|
b74969 |
- if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS) {
|
|
|
b74969 |
- convert_to_string(*z_date);
|
|
|
b74969 |
- if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS) {
|
|
|
b74969 |
- convert_to_long(*z_timezone_type);
|
|
|
b74969 |
- if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS) {
|
|
|
b74969 |
- convert_to_string(*z_timezone);
|
|
|
b74969 |
+ if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS && Z_TYPE_PP(z_date) == IS_STRING) {
|
|
|
b74969 |
+ if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) {
|
|
|
b74969 |
+ if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) {
|
|
|
b74969 |
|
|
|
b74969 |
switch (Z_LVAL_PP(z_timezone_type)) {
|
|
|
b74969 |
case TIMELIB_ZONETYPE_OFFSET:
|
|
|
b74969 |
@@ -2541,7 +2538,6 @@ static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht
|
|
|
b74969 |
|
|
|
b74969 |
case TIMELIB_ZONETYPE_ID: {
|
|
|
b74969 |
int ret;
|
|
|
b74969 |
- convert_to_string(*z_timezone);
|
|
|
b74969 |
|
|
|
b74969 |
tzi = php_date_parse_tzfile(Z_STRVAL_PP(z_timezone), DATE_TIMEZONEDB TSRMLS_CC);
|
|
|
b74969 |
|
|
|
b74969 |
diff --git a/ext/date/tests/bug68942_2.phpt b/ext/date/tests/bug68942_2.phpt
|
|
|
b74969 |
new file mode 100644
|
|
|
b74969 |
index 0000000..5b02567
|
|
|
b74969 |
--- /dev/null
|
|
|
b74969 |
+++ b/ext/date/tests/bug68942_2.phpt
|
|
|
b74969 |
@@ -0,0 +1,9 @@
|
|
|
b74969 |
+--TEST--
|
|
|
b74969 |
+Bug #68942 (Use after free vulnerability in unserialize() with DateTime).
|
|
|
b74969 |
+--FILE--
|
|
|
b74969 |
+
|
|
|
b74969 |
+$data = unserialize('a:2:{i:0;O:8:"DateTime":3:{s:4:"date";s:26:"2000-01-01 00:00:00.000000";s:13:"timezone_type";a:2:{i:0;i:1;i:1;i:2;}s:8:"timezone";s:1:"A";}i:1;R:5;}');
|
|
|
b74969 |
+var_dump($data);
|
|
|
b74969 |
+?>
|
|
|
b74969 |
+--EXPECTF--
|
|
|
b74969 |
+Fatal error: Invalid serialization data for DateTime object in %s/bug68942_2.php on line %d
|
|
|
b74969 |
--
|
|
|
b74969 |
2.1.4
|
|
|
b74969 |
|