com php-src: Merge branch 'PHP-5.6': Zend/zend_API.c ext/ exif/exif.c ext/gmp/gmp.c ext/gmp/tests/bug7028 4.phpt ext/hash/hash_haval.c
ext/pcre/php_pcre. c ext/session/session.c ext/session/tests/session_decod e_error2.phpt ext/soap/soap.c ext/spl/spl_dllist .c
ext/standard/tests/serialize/bug70172_2. phpt ext/standard/tests/serialize/bug70219.phpt ext/standard/var.c ext/standard/var_unserializer.c
ext/standard/var_unserializer.re ext/xsl/xsltprocessor
| From: | Stanislav Malyshev | Date: | Wed, 02 Sep 2015 07:37:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': Zend/zend_API.c ext/ exif/exif.c ext/gmp/gmp.c ext/gmp/tests/bug7028 4.phpt ext/hash/hash_haval.c ext/pcre/php_pcre. c ext/session/session.c ext/session/tests/session_decod e_error2.phpt ext/soap/soap.c ext/spl/spl_dllist .c ext/standard/tests/serialize/bug70172_2. phpt ext/standard/tests/serialize/bug70219.phpt ext/standard/var.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/xsl/xsltprocessor |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88852@lists.php.net to get a copy of this message | ||
Commit: 9b1a224d4e994219a6ef1d1d8fdcc1b0598ba3ab
Author: Stanislav Malyshev <stas@php.net> Tue, 1 Sep 2015 12:40:10 -0700
Parents: 50d6fd6a032aad352d0daa52540698131813a4ec 3fe509443ccaebd5626f18490f36f088cde16d3f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9b1a224d4e994219a6ef1d1d8fdcc1b0598ba3ab
Log:
Merge branch 'PHP-5.6'
* PHP-5.6: (21 commits)
fix unit tests
update NEWS
add NEWS for fixes
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
....
Conflicts:
ext/exif/exif.c
ext/gmp/gmp.c
ext/pcre/php_pcre.c
ext/session/session.c
ext/session/tests/session_decode_variation3.phpt
ext/soap/soap.c
ext/spl/spl_observer.c
ext/standard/var.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/xsl/xsltprocessor.c
Bugs:
https://bugs.php.net/70172
https://bugs.php.net/70312
https://bugs.php.net/70366
https://bugs.php.net/70365
https://bugs.php.net/70388
https://bugs.php.net/70350
https://bugs.php.net/70385
https://bugs.php.net/70345
https://bugs.php.net/70219
https://bugs.php.net/70284
https://bugs.php.net/69782
https://bugs.php.net/69085
Changed paths:
MM Zend/zend_API.c
MM ext/exif/exif.c
MM ext/gmp/gmp.c
AM ext/gmp/tests/bug70284.phpt
MM ext/hash/hash_haval.c
MM ext/pcre/php_pcre.c
MM ext/session/session.c
MM ext/session/tests/session_decode_error2.phpt
MM ext/soap/soap.c
MM ext/spl/spl_dllist.c
AM ext/standard/tests/serialize/bug70172_2.phpt
AM ext/standard/tests/serialize/bug70219.phpt
MM ext/standard/var.c
MM ext/standard/var_unserializer.c
MM ext/standard/var_unserializer.re
MM ext/xsl/xsltprocessor.c
MM ext/zip/php_zip.c
diff --cc Zend/zend_API.c index 0796ee9,ed56fef..8f288a7 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@@ -1217,58 -1169,6 +1217,67 @@@ ZEND_API void object_properties_init(ze } /* }}} */ +ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properties) /* {{{ */ +{ + object->properties = properties; + if (object->ce->default_properties_count) { + zval *prop; + zend_string *key; + zend_property_info *property_info; + + ZEND_HASH_FOREACH_STR_KEY_VAL(properties, key, prop) { + property_info = zend_get_property_info(object->ce, key, 1); + if (property_info != ZEND_WRONG_PROPERTY_INFO && + property_info && + (property_info->flags & ZEND_ACC_STATIC) == 0) { + zval *slot = OBJ_PROP(object, property_info->offset); + ZVAL_COPY_VALUE(slot, prop); + ZVAL_INDIRECT(prop, slot); + } + } ZEND_HASH_FOREACH_END(); + } +} +/* }}} */ + +ZEND_API void object_properties_load(zend_object *object, HashTable *properties) /* {{{ */ +{ + zval *prop, tmp; + zend_string *key; ++ zend_long h; + zend_property_info *property_info; + - ZEND_HASH_FOREACH_STR_KEY_VAL(properties, key, prop) { - property_info = zend_get_property_info(object->ce, key, 1); - if (property_info != ZEND_WRONG_PROPERTY_INFO && - property_info && - (property_info->flags & ZEND_ACC_STATIC) == 0) { - zval *slot = OBJ_PROP(object, property_info->offset); - zval_ptr_dtor(slot); - ZVAL_COPY_VALUE(slot, prop); - zval_add_ref(slot); - if (object->properties) { - ZVAL_INDIRECT(&tmp, slot); - zend_hash_update(object->properties, key, &tmp); ++ ZEND_HASH_FOREACH_KEY_VAL(properties, h, key, prop) { ++ if(key) { ++ property_info = zend_get_property_info(object->ce, key, 1); ++ if (property_info != ZEND_WRONG_PROPERTY_INFO && ++ property_info && ++ (property_info->flags & ZEND_ACC_STATIC) == 0) { ++ zval *slot = OBJ_PROP(object, property_info->offset); ++ zval_ptr_dtor(slot); ++ ZVAL_COPY_VALUE(slot, prop); ++ zval_add_ref(slot); ++ if (object->properties) { ++ ZVAL_INDIRECT(&tmp, slot); ++ zend_hash_update(object->properties, key, &tmp); ++ } ++ } else { ++ if (!object->properties) { ++ rebuild_object_properties(object); ++ } ++ prop = zend_hash_update(object->properties, key, prop); ++ zval_add_ref(prop); + } + } else { + if (!object->properties) { + rebuild_object_properties(object); + } - prop = zend_hash_update(object->properties, key, prop); ++ prop = zend_hash_index_update(object->properties, h, prop); + zval_add_ref(prop); + } + } ZEND_HASH_FOREACH_END(); +} +/* }}} */ + /* This function requires 'properties' to contain all props declared in the * class and all props being public. If only a subset is given or the class * has protected members then you need to merge the properties separately by diff --cc ext/gmp/gmp.c index 0cac3de,c7cdef7..191afdd --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@@ -585,44 -630,44 +585,42 @@@ static int gmp_unserialize(zval *object { mpz_ptr gmpnum; const unsigned char *p, *max; - zval zv; - zval *zv_ptr; ++ zval *zv; int retval = FAILURE; php_unserialize_data_t unserialize_data = (php_unserialize_data_t) data; - ZVAL_UNDEF(&zv); PHP_VAR_UNSERIALIZE_INIT(unserialize_data); - gmp_create_ex(*object, &gmpnum TSRMLS_CC); + gmp_create(object, &gmpnum); p = buf; max = buf + buf_len; - if (!php_var_unserialize(&zv, &p, max, &unserialize_data) - || Z_TYPE(zv) != IS_STRING - || convert_to_gmp(gmpnum, &zv, 10) == FAILURE - ALLOC_INIT_ZVAL(zv_ptr); - if (!php_var_unserialize(&zv_ptr, &p, max, &unserialize_data TSRMLS_CC) - || Z_TYPE_P(zv_ptr) != IS_STRING - || convert_to_gmp(gmpnum, zv_ptr, 10 TSRMLS_CC) == FAILURE ++ zv = var_tmp_var(&unserialize_data); ++ if (!php_var_unserialize(zv, &p, max, &unserialize_data) ++ || Z_TYPE_P(zv) != IS_STRING ++ || convert_to_gmp(gmpnum, zv, 10) == FAILURE ) { - zend_throw_exception(NULL, "Could not unserialize number", 0 TSRMLS_CC); + zend_throw_exception(NULL, "Could not unserialize number", 0); goto exit; } - zval_dtor(&zv); - ZVAL_UNDEF(&zv); - var_push_dtor_no_addref(&unserialize_data, &zv_ptr); - if (!php_var_unserialize(&zv, &p, max, &unserialize_data) - || Z_TYPE(zv) != IS_ARRAY - ALLOC_INIT_ZVAL(zv_ptr); - if (!php_var_unserialize(&zv_ptr, &p, max, &unserialize_data TSRMLS_CC) - || Z_TYPE_P(zv_ptr) != IS_ARRAY ++ zv = var_tmp_var(&unserialize_data); ++ if (!php_var_unserialize(zv, &p, max, &unserialize_data) ++ || Z_TYPE_P(zv) != IS_ARRAY ) { - zend_throw_exception(NULL, "Could not unserialize properties", 0 TSRMLS_CC); + zend_throw_exception(NULL, "Could not unserialize properties", 0); goto exit; } - if (zend_hash_num_elements(Z_ARRVAL(zv)) != 0) { - if (zend_hash_num_elements(Z_ARRVAL_P(zv_ptr)) != 0) { ++ if (zend_hash_num_elements(Z_ARRVAL_P(zv)) != 0) { zend_hash_copy( - zend_std_get_properties(object), Z_ARRVAL(zv), - zend_std_get_properties(*object TSRMLS_CC), Z_ARRVAL_P(zv_ptr), - (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *) ++ zend_std_get_properties(object), Z_ARRVAL_P(zv), + (copy_ctor_func_t) zval_add_ref ); } retval = SUCCESS; exit: - zval_dtor(&zv); - var_push_dtor_no_addref(&unserialize_data, &zv_ptr); PHP_VAR_UNSERIALIZE_DESTROY(unserialize_data); return retval; } diff --cc ext/gmp/tests/bug70284.phpt index 0000000,ab17c0f..58fc50c mode 000000,100644..100644 --- a/ext/gmp/tests/bug70284.phpt +++ b/ext/gmp/tests/bug70284.phpt @@@ -1,0 -1,50 +1,50 @@@ + --TEST-- + Bug #70284 (Use after free vulnerability in unserialize() with GMP) + --SKIPIF-- + <?php if (!extension_loaded("gmp")) print "skip"; ?> + --FILE-- + <?php + + $inner = 'r:2;a:1:{i:0;a:1:{i:0;r:4;}}'; + $exploit = 'a:2:{i:0;s:1:"1";i:1;C:3:"GMP":'.strlen($inner).':{'.$inner.'}}'; + + $data = unserialize($exploit); + + $fakezval = ptr2str(1122334455); + $fakezval .= ptr2str(0); + $fakezval .= "\x00\x00\x00\x00"; + $fakezval .= "\x01"; + $fakezval .= "\x00"; + $fakezval .= "\x00\x00"; + + for ($i = 0; $i < 5; $i++) { + $v[$i] = $fakezval.$i; + } + + var_dump($data); + + function ptr2str($ptr) + { + $out = ''; + for ($i = 0; $i < 8; $i++) { + $out .= chr($ptr & 0xff); + $ptr >>= 8; + } + return $out; + } + ?> + --EXPECTF-- + array(2) { + [0]=> + string(1) "1" + [1]=> + object(GMP)#%d (2) { + [0]=> + array(1) { + [0]=> - NULL ++ string(1) "1" + } + ["num"]=> + string(1) "1" + } + } diff --cc ext/pcre/php_pcre.c index 55ca8fa,36d913d..3ec6e62 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@@ -758,17 -709,11 +758,17 @@@ PHPAPI void php_pcre_match_impl(pcre_ca /* If subpatterns array has been passed, fill it in with values. */ if (subpats != NULL) { /* Try to get the list of substrings and display a warning if failed. */ - if (pcre_get_substring_list(subject, offsets, count, &stringlist) < 0) { + if ((offsets[1] - offsets[0] < 0) || pcre_get_substring_list(subject, offsets, count, &stringlist) < 0) { - efree(subpat_names); - efree(offsets); + if (subpat_names) { + efree(subpat_names); + } + if (size_offsets <= 32) { + free_alloca(offsets, use_heap); + } else { + efree(offsets); + } if (match_sets) efree(match_sets); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Get subpatterns list failed"); + php_error_docref(NULL, E_WARNING, "Get subpatterns list failed"); RETURN_FALSE; } @@@ -1176,12 -1170,10 +1176,12 @@@ PHPAPI zend_string *php_pcre_replace_im piece = subject + start_offset; - if (count > 0 && (offsets[1] - offsets[0] >= 0) && (limit == -1 || limit > 0)) { - if (replace_count) { + /* if (EXPECTED(count > 0 && (limit == -1 || limit > 0))) */ - if (EXPECTED(count > 0 && limit)) { ++ if (EXPECTED(count > 0 && (offsets[1] - offsets[0] >= 0) && limit)) { + if (UNEXPECTED(replace_count)) { ++*replace_count; } + /* Set the match location in subject */ match = subject + offsets[0]; diff --cc ext/session/session.c index ef17b86,56540ae..f2e1f7c --- a/ext/session/session.c +++ b/ext/session/session.c @@@ -62,8 -61,8 +62,9 @@@ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps) -static int php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra TSRMLS_DC); -static int (*php_session_rfc1867_orig_callback)(unsigned int event, void *event_data, void **extra TSRMLS_DC); +static int php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra); +static int (*php_session_rfc1867_orig_callback)(unsigned int event, void *event_data, void **extra); ++static void php_session_track_init(void); /* SessionHandler class */ zend_class_entry *php_session_class_entry; @@@ -135,12 -120,12 +136,13 @@@ static inline void php_rshutdown_sessio } /* }}} */ -static int php_session_destroy(TSRMLS_D) /* {{{ */ +static int php_session_destroy(void) /* {{{ */ { int retval = SUCCESS; ++ zend_string *var_name; if (PS(session_status) != php_session_active) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Trying to destroy uninitialized session"); + php_error_docref(NULL, E_WARNING, "Trying to destroy uninitialized session"); return FAILURE; } @@@ -227,15 -216,15 +229,16 @@@ static zend_string *php_session_encode( } /* }}} */ -static int php_session_decode(const char *val, int vallen TSRMLS_DC) /* {{{ */ +static int php_session_decode(zend_string *data) /* {{{ */ { if (!PS(serializer)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown session.serialize_handler. Failed to decode session object"); + php_error_docref(NULL, E_WARNING, "Unknown session.serialize_handler. Failed to decode session object"); return FAILURE; } - if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) { - php_session_destroy(TSRMLS_C); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode session object. Session has been destroyed"); + if (PS(serializer)->decode(ZSTR_VAL(data), ZSTR_LEN(data)) == FAILURE) { + php_session_destroy(); ++ php_session_track_init(); + php_error_docref(NULL, E_WARNING, "Failed to decode session object. Session has been destroyed"); return FAILURE; } return SUCCESS; @@@ -946,16 -946,17 +949,18 @@@ PS_SERIALIZER_DECODE_FUNC(php_binary) / } if (has_value) { - ALLOC_INIT_ZVAL(current); - if (php_var_unserialize(¤t, (const unsigned char **) &p, (const unsigned char *) endptr, &var_hash TSRMLS_CC)) { - php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); + ZVAL_UNDEF(¤t); + if (php_var_unserialize(¤t, (const unsigned char **) &p, (const unsigned char *) endptr, &var_hash)) { + zval *zv = php_set_session_var(name, ¤t, &var_hash ); + var_replace(&var_hash, ¤t, zv); } else { + zval_ptr_dtor(¤t); + PHP_VAR_UNSERIALIZE_DESTROY(var_hash); + return FAILURE; } - var_push_dtor_no_addref(&var_hash, ¤t); } - PS_ADD_VARL(name, namelen); - efree(name); + PS_ADD_VARL(name); + zend_string_release(name); } PHP_VAR_UNSERIALIZE_DESTROY(var_hash); @@@ -1036,17 -1041,20 +1041,19 @@@ PS_SERIALIZER_DECODE_FUNC(php) /* {{{ * } if (has_value) { - ALLOC_INIT_ZVAL(current); - if (php_var_unserialize(¤t, (const unsigned char **) &q, (const unsigned char *) endptr, &var_hash TSRMLS_CC)) { - php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); + ZVAL_UNDEF(¤t); + if (php_var_unserialize(¤t, (const unsigned char **) &q, (const unsigned char *) endptr, &var_hash)) { + zval *zv = php_set_session_var(name, ¤t, &var_hash); + var_replace(&var_hash, ¤t, zv); } else { - var_push_dtor_no_addref(&var_hash, ¤t); - efree(name); + zval_ptr_dtor(¤t); + PHP_VAR_UNSERIALIZE_DESTROY(var_hash); + return FAILURE; } - var_push_dtor_no_addref(&var_hash, ¤t); } - PS_ADD_VARL(name, namelen); + PS_ADD_VARL(name); skip: - efree(name); + zend_string_release(name); p = q; } @@@ -2168,11 -2073,7 +2175,10 @@@ static PHP_FUNCTION(session_decode return; } - RETVAL_BOOL(php_session_decode(str, str_len TSRMLS_CC) == SUCCESS); + if (php_session_decode(str) == FAILURE) { - /* FIXME: session_decode() should return FALSE */ - /* RETURN_FALSE; */ ++ RETURN_FALSE; + } + RETURN_TRUE; } /* }}} */ diff --cc ext/session/tests/session_decode_error2.phpt index 4160f87,515047b..30be587 --- a/ext/session/tests/session_decode_error2.phpt +++ b/ext/session/tests/session_decode_error2.phpt @@@ -18,6 -18,6 +18,7 @@@ $data = "foo|a:3:{i:0;i:1;i:1;i:2;i:2;i var_dump(session_start()); for($index = 0; $index < strlen($data); $index++) { ++ if(session_status() != PHP_SESSION_ACTIVE) { session_start(); } echo "\n-- Iteration $index --\n"; $encoded = substr($data, 0, $index); var_dump(session_decode($encoded)); @@@ -60,206 -60,148 +61,206 @@@ array(0) } -- Iteration 5 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 6 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 7 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 8 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 9 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 10 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 11 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 12 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 13 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 14 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 15 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 16 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 17 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 18 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 19 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 20 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 21 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 22 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 23 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 24 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 25 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 26 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 27 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 28 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 29 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 30 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 31 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 32 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 33 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 34 -- @@@ -333,67 -230,23 +334,31 @@@ array(1) } -- Iteration 39 -- - bool(true) - array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 40 -- - bool(true) - array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 41 -- - bool(true) - array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 42 -- - bool(true) - array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 43 -- @@@ -512,104 -275,25 +477,33 @@@ array(2) } -- Iteration 48 -- - bool(true) - array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 49 -- - bool(true) - array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 50 -- - bool(true) - array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 51 -- - bool(true) - array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } - bool(true) - Done + Warning: session_destroy(): Trying to destroy uninitialized session in %s/session_decode_error2.php on line %d + bool(false) + Done diff --cc ext/soap/soap.c index 3c4a86c,32420fd..d2b1d30 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@@ -1488,26 -1487,6 +1488,26 @@@ PHP_METHOD(SoapServer, addFunction } /* }}} */ +static void _soap_server_exception(soapServicePtr service, sdlFunctionPtr function, zval *this_ptr) /* {{{ */ +{ + zval exception_object; + + ZVAL_OBJ(&exception_object, EG(exception)); + if (instanceof_function(Z_OBJCE(exception_object), soap_fault_class_entry)) { + soap_server_fault_ex(function, &exception_object, NULL); + } else if (instanceof_function(Z_OBJCE(exception_object), zend_ce_error)) { + if (service->send_errors) { + zval rv; + zend_string *msg = zval_get_string(zend_read_property(zend_ce_error, &exception_object, "message", sizeof("message")-1, 0, &rv)); + add_soap_fault_ex(&exception_object, this_ptr, "Server", ZSTR_VAL(msg), NULL, NULL); + zend_string_release(msg); + } else { + add_soap_fault_ex(&exception_object, this_ptr, "Server", "Internal Error", NULL, NULL); + } + soap_server_fault_ex(function, &exception_object, NULL); - } ++ } +} +/* }}} */ /* {{{ proto void SoapServer::handle ( [string soap_request]) Handles a SOAP request */ @@@ -2915,20 -2909,26 +2915,22 @@@ PHP_METHOD(SoapClient, __call } /* Add default headers */ - if (zend_hash_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers"), (void **) &tmp) == SUCCESS && Z_TYPE_PP(tmp) == IS_ARRAY) { - HashTable *default_headers = Z_ARRVAL_P(*tmp); + this_ptr = getThis(); + if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_ARRAY) { + HashTable *default_headers = Z_ARRVAL_P(tmp); if (soap_headers) { if (!free_soap_headers) { - HashTable *t = emalloc(sizeof(HashTable)); - zend_hash_init(t, 0, NULL, ZVAL_PTR_DTOR, 0); - zend_hash_copy(t, soap_headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - soap_headers = t; + soap_headers = zend_array_dup(soap_headers); free_soap_headers = 1; } - zend_hash_internal_pointer_reset(default_headers); - while (zend_hash_get_current_data(default_headers, (void**)&tmp) == SUCCESS) { - if(Z_TYPE_PP(tmp) == IS_OBJECT) { - Z_ADDREF_PP(tmp); - zend_hash_next_index_insert(soap_headers, tmp, sizeof(zval *), NULL); + ZEND_HASH_FOREACH_VAL(default_headers, tmp) { - Z_ADDREF_P(tmp); - zend_hash_next_index_insert(soap_headers, tmp); ++ if(Z_TYPE_P(tmp) == IS_OBJECT) { ++ Z_ADDREF_P(tmp); ++ zend_hash_next_index_insert(soap_headers, tmp); + } - zend_hash_move_forward(default_headers); - } + } ZEND_HASH_FOREACH_END(); } else { - soap_headers = Z_ARRVAL_P(*tmp); + soap_headers = Z_ARRVAL_P(tmp); free_soap_headers = 0; } } @@@ -4329,16 -4346,24 +4331,21 @@@ static xmlDocPtr serialize_function_cal } if (head) { - zval** header; + zval* header; - for(zend_hash_internal_pointer_reset(soap_headers); - zend_hash_get_current_data(soap_headers,(void**)&header) == SUCCESS; - zend_hash_move_forward(soap_headers) - ) { + ZEND_HASH_FOREACH_VAL(soap_headers, header) { - HashTable *ht = Z_OBJPROP_P(header); + HashTable *ht; - zval **name, **ns, **tmp; + zval *name, *ns, *tmp; - if (Z_TYPE_PP(header) != IS_OBJECT) { ++ if (Z_TYPE_P(header) != IS_OBJECT) { + continue; + } + - ht = Z_OBJPROP_PP(header); - if (zend_hash_find(ht, "name", sizeof("name"), (void**)&name) == SUCCESS && - Z_TYPE_PP(name) == IS_STRING && - zend_hash_find(ht, "namespace", sizeof("namespace"), (void**)&ns) == SUCCESS && - Z_TYPE_PP(ns) == IS_STRING) { ++ ht = Z_OBJPROP_P(header); + if ((name = zend_hash_str_find(ht, "name", sizeof("name")-1)) != NULL && + Z_TYPE_P(name) == IS_STRING && + (ns = zend_hash_str_find(ht, "namespace", sizeof("namespace")-1)) != NULL && + Z_TYPE_P(ns) == IS_STRING) { xmlNodePtr h; xmlNsPtr nsptr; int hdr_use = SOAP_LITERAL; diff --cc ext/spl/spl_dllist.c index 210bcdf,66c273a..d7976f3 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@@ -1206,12 -1214,14 +1206,13 @@@ SPL_METHOD(SplDoublyLinkedList, unseria /* elements */ while(*p == ':') { ++p; - ALLOC_INIT_ZVAL(elem); - if (!php_var_unserialize(&elem, &p, s + buf_len, &var_hash TSRMLS_CC)) { - zval_ptr_dtor(&elem); + elem = var_tmp_var(&var_hash); + if (!php_var_unserialize(elem, &p, s + buf_len, &var_hash)) { goto error; } - var_push_dtor(&var_hash, &elem); ++ var_push_dtor(&var_hash, elem); - spl_ptr_llist_push(intern->llist, elem TSRMLS_CC); + spl_ptr_llist_push(intern->llist, elem); } if (*p != '\0') { diff --cc ext/standard/tests/serialize/bug70172_2.phpt index 0000000,ae48341..1fc97a9 mode 000000,100644..100644 --- a/ext/standard/tests/serialize/bug70172_2.phpt +++ b/ext/standard/tests/serialize/bug70172_2.phpt @@@ -1,0 -1,68 +1,68 @@@ + --TEST-- + Bug #70172 - Use After Free Vulnerability in unserialize() + --FILE-- + <?php + class obj implements Serializable { + var $data; + function serialize() { + return serialize($this->data); + } + function unserialize($data) { + $this->data = unserialize($data); + } + } + + class obj2 { + var $ryat; + function __wakeup() { + $this->ryat = 1; + } + } + + $fakezval = ptr2str(1122334455); + $fakezval .= ptr2str(0); + $fakezval .= "\x00\x00\x00\x00"; + $fakezval .= "\x01"; + $fakezval .= "\x00"; + $fakezval .= "\x00\x00"; + + $inner = 'r:2;'; + $exploit = 'a:2:{i:0;O:4:"obj2":1:{s:4:"ryat";C:3:"obj":'.strlen($inner).':{'.$inner.'}}i:1;a:1:{i:0;a:1:{i:0;R:4;}}}'; + + $data = unserialize($exploit); + + for ($i = 0; $i < 5; $i++) { + $v[$i] = $fakezval.$i; + } + + var_dump($data); + + function ptr2str($ptr) + { + $out = ''; + for ($i = 0; $i < 8; $i++) { + $out .= chr($ptr & 0xff); + $ptr >>= 8; + } + return $out; + } + ?> + --EXPECTF-- + array(2) { + [0]=> + object(obj2)#%d (1) { + ["ryat"]=> + int(1) + } + [1]=> + array(1) { + [0]=> + array(1) { + [0]=> - object(obj2)#%d (1) { ++ &object(obj2)#%d (1) { + ["ryat"]=> + int(1) + } + } + } + } diff --cc ext/standard/tests/serialize/bug70219.phpt index 0000000,84a059f..da2a0f2 mode 000000,100644..100644 --- a/ext/standard/tests/serialize/bug70219.phpt +++ b/ext/standard/tests/serialize/bug70219.phpt @@@ -1,0 -1,38 +1,40 @@@ + --TEST-- + Bug #70219 Use after free vulnerability in session deserializer + --FILE-- + <?php + class obj implements Serializable { + var $data; + function serialize() { + return serialize($this->data); + } + function unserialize($data) { + session_start(); + session_decode($data); + } + } + + $inner = 'ryat|a:1:{i:0;a:1:{i:1;'; + $exploit = 'a:2:{i:0;C:3:"obj":'.strlen($inner).':{'.$inner.'}i:1;R:4;}'; + + $data = unserialize($exploit); + + for ($i = 0; $i < 5; $i++) { + $v[$i] = 'hi'.$i; + } + + var_dump($data); + ?> + --EXPECTF-- + Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d + array(2) { + [0]=> + object(obj)#%d (1) { + ["data"]=> + NULL + } + [1]=> - array(0) { ++ &array(1) { ++ ["data"]=> ++ NULL + } + } diff --cc ext/standard/var.c index 40b5acb,8d8f68a..8b0f889 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@@ -1040,13 -945,13 +1040,14 @@@ PHP_FUNCTION(serialize PHP_FUNCTION(unserialize) { char *buf = NULL; - int buf_len; + size_t buf_len; const unsigned char *p; php_unserialize_data_t var_hash; - int oldlevel; + zval *options = NULL, *classes = NULL; + HashTable *class_hash = NULL; + zval *old_rval = return_value; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|a", &buf, &buf_len, &options) == FAILURE) { RETURN_FALSE; } diff --cc ext/standard/var_unserializer.c index 046db56,575070b..43e82d2 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -61,51 -55,51 +61,57 @@@ static inline void var_push(php_unseria (*var_hashx)->last = var_hash; } - var_hash->data[var_hash->used_slots++] = *rval; + var_hash->data[var_hash->used_slots++] = rval; } -PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval *rval) { - var_entries *var_hash; - - if (!var_hashx || !*var_hashx) { - return; - } - - var_hash = (*var_hashx)->last_dtor; -#if VAR_ENTRIES_DBG - fprintf(stderr, "var_push_dtor(%p, %ld): %d\n", *rval, var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval)); -#endif - - if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { - var_hash = emalloc(sizeof(var_entries)); - var_hash->used_slots = 0; - var_hash->next = 0; + zval *tmp_var = var_tmp_var(var_hashx); + if (!tmp_var) { + return; + } + ZVAL_COPY(tmp_var, rval); +} - if (!(*var_hashx)->first_dtor) { - (*var_hashx)->first_dtor = var_hash; - } else { - ((var_entries *) (*var_hashx)->last_dtor)->next = var_hash; - } +PHPAPI zval *var_tmp_var(php_unserialize_data_t *var_hashx) +{ + var_dtor_entries *var_hash; - (*var_hashx)->last_dtor = var_hash; - } + if (!var_hashx || !*var_hashx) { + return NULL; + } - Z_ADDREF_PP(rval); - var_hash->data[var_hash->used_slots++] = *rval; + var_hash = (*var_hashx)->last_dtor; + if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { + var_hash = emalloc(sizeof(var_dtor_entries)); + var_hash->used_slots = 0; + var_hash->next = 0; + + if (!(*var_hashx)->first_dtor) { + (*var_hashx)->first_dtor = var_hash; + } else { + ((var_dtor_entries *) (*var_hashx)->last_dtor)->next = var_hash; + } + + (*var_hashx)->last_dtor = var_hash; + } + ZVAL_UNDEF(&var_hash->data[var_hash->used_slots]); + return &var_hash->data[var_hash->used_slots++]; } -PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval) +//??? +#if 0 +PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rval) { - var_dtor_entries *var_hash = (*var_hashx)->last_dtor; + var_entries *var_hash; + + if (!var_hashx || !*var_hashx) { + return; + } + + var_hash = (*var_hashx)->last_dtor; #if VAR_ENTRIES_DBG - fprintf(stderr, "var_push_dtor_no_addref(%ld): %d (%d)\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval)); + fprintf(stderr, "var_push_dtor_no_addref(%p, %ld): %d (%d)\n", *rval, var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval)); #endif if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { @@@ -181,13 -174,18 +187,16 @@@ PHPAPI void var_destroy(php_unserialize var_hash = next; } - var_hash = (*var_hashx)->first_dtor; - - while (var_hash) { - for (i = 0; i < var_hash->used_slots; i++) { + while (var_dtor_hash) { + for (i = 0; i < var_dtor_hash->used_slots; i++) { + #if VAR_ENTRIES_DBG - fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_hash->data[i], Z_REFCOUNT_P(var_hash->data[i])); ++ fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_dtor_hash->data[i], Z_REFCOUNT_P(var_dtor_hash->data[i])); + #endif - zval_ptr_dtor(&var_hash->data[i]); + zval_ptr_dtor(&var_dtor_hash->data[i]); } - next = var_hash->next; - efree(var_hash); - var_hash = next; + next = var_dtor_hash->next; + efree_size(var_dtor_hash, sizeof(var_dtor_entries)); + var_dtor_hash = next; } } @@@ -263,7 -241,7 +272,7 @@@ static inline int unserialize_allowed_c #define YYMARKER marker - #line 271 "ext/standard/var_unserializer.re" -#line 249 "ext/standard/var_unserializer.re" ++#line 280 "ext/standard/var_unserializer.re" @@@ -530,7 -480,9 +539,7 @@@ PHPAPI int php_var_unserialize_ex(UNSER start = cursor; - #line 534 "ext/standard/var_unserializer.c" - - -#line 486 "ext/standard/var_unserializer.c" ++#line 543 "ext/standard/var_unserializer.c" { YYCTYPE yych; static const unsigned char yybm[] = { @@@ -590,9 -542,9 +599,9 @@@ yy2 yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy95; yy3: - #line 881 "ext/standard/var_unserializer.re" -#line 840 "ext/standard/var_unserializer.re" ++#line 893 "ext/standard/var_unserializer.re" { return 0; } - #line 596 "ext/standard/var_unserializer.c" -#line 548 "ext/standard/var_unserializer.c" ++#line 605 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy89; @@@ -635,13 -587,13 +644,13 @@@ yy13 goto yy3; yy14: ++YYCURSOR; - #line 875 "ext/standard/var_unserializer.re" -#line 834 "ext/standard/var_unserializer.re" ++#line 887 "ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); + php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } - #line 645 "ext/standard/var_unserializer.c" -#line 597 "ext/standard/var_unserializer.c" ++#line 654 "ext/standard/var_unserializer.c" yy16: yych = *++YYCURSOR; goto yy3; @@@ -671,21 -624,23 +681,22 @@@ yy20 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 730 "ext/standard/var_unserializer.re" -#line 687 "ext/standard/var_unserializer.re" ++#line 741 "ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; - long elements; - char *class_name; + zend_long elements; + char *str; + zend_string *class_name; zend_class_entry *ce; - zend_class_entry **pce; int incomplete_class = 0; int custom_object = 0; - zval *user_func; - zval *retval_ptr; - zval **args[1]; - zval *arg_func_name; + zval user_func; + zval retval; + zval args[1]; + if (!var_hash) return 0; if (*start == 'C') { custom_object = 1; } @@@ -816,7 -771,7 +827,7 @@@ return object_common2(UNSERIALIZE_PASSTHRU, elements); } - #line 820 "ext/standard/var_unserializer.c" -#line 775 "ext/standard/var_unserializer.c" ++#line 831 "ext/standard/var_unserializer.c" yy25: yych = *++YYCURSOR; if (yych <= ',') { @@@ -841,15 -796,16 +852,16 @@@ yy27 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 722 "ext/standard/var_unserializer.re" -#line 678 "ext/standard/var_unserializer.re" ++#line 732 "ext/standard/var_unserializer.re" { + if (!var_hash) return 0; - INIT_PZVAL(*rval); +//??? INIT_PZVAL(rval); return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } - #line 853 "ext/standard/var_unserializer.c" -#line 809 "ext/standard/var_unserializer.c" ++#line 865 "ext/standard/var_unserializer.c" yy32: yych = *++YYCURSOR; if (yych == '+') goto yy33; @@@ -870,11 -826,12 +882,12 @@@ yy34 yych = *++YYCURSOR; if (yych != '{') goto yy18; ++YYCURSOR; - #line 701 "ext/standard/var_unserializer.re" -#line 657 "ext/standard/var_unserializer.re" ++#line 710 "ext/standard/var_unserializer.re" { - long elements = parse_iv(start + 2); + zend_long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ *p = YYCURSOR; + if (!var_hash) return 0; if (elements < 0) { return 0; @@@ -891,7 -847,7 +904,7 @@@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } - #line 895 "ext/standard/var_unserializer.c" -#line 851 "ext/standard/var_unserializer.c" ++#line 908 "ext/standard/var_unserializer.c" yy39: yych = *++YYCURSOR; if (yych == '+') goto yy40; @@@ -912,10 -868,10 +925,10 @@@ yy41 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 673 "ext/standard/var_unserializer.re" -#line 628 "ext/standard/var_unserializer.re" ++#line 682 "ext/standard/var_unserializer.re" { size_t len, maxlen; - char *str; + zend_string *str; len = parse_uiv(start + 2); maxlen = max - YYCURSOR; @@@ -937,10 -893,11 +950,10 @@@ YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 0); + ZVAL_STR(rval, str); return 1; } - #line 944 "ext/standard/var_unserializer.c" -#line 901 "ext/standard/var_unserializer.c" ++#line 957 "ext/standard/var_unserializer.c" yy46: yych = *++YYCURSOR; if (yych == '+') goto yy47; @@@ -961,7 -918,7 +974,7 @@@ yy48 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 646 "ext/standard/var_unserializer.re" -#line 600 "ext/standard/var_unserializer.re" ++#line 655 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@@ -985,10 -942,11 +998,10 @@@ YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 1); + ZVAL_STRINGL(rval, str, len); return 1; } - #line 992 "ext/standard/var_unserializer.c" -#line 950 "ext/standard/var_unserializer.c" ++#line 1005 "ext/standard/var_unserializer.c" yy53: yych = *++YYCURSOR; if (yych <= '/') { @@@ -1076,16 -1034,17 +1089,16 @@@ yy61 } yy63: ++YYCURSOR; - #line 637 "ext/standard/var_unserializer.re" -#line 590 "ext/standard/var_unserializer.re" ++#line 646 "ext/standard/var_unserializer.re" { -#if SIZEOF_LONG == 4 +#if SIZEOF_ZEND_LONG == 4 use_double: #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); + ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL)); return 1; } - #line 1089 "ext/standard/var_unserializer.c" -#line 1048 "ext/standard/var_unserializer.c" ++#line 1102 "ext/standard/var_unserializer.c" yy65: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1144,23 -1103,22 +1157,23 @@@ yy73 yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 621 "ext/standard/var_unserializer.re" -#line 575 "ext/standard/var_unserializer.re" ++#line 630 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - - if (!strncmp(start + 2, "NAN", 3)) { - ZVAL_DOUBLE(*rval, php_get_nan()); - } else if (!strncmp(start + 2, "INF", 3)) { - ZVAL_DOUBLE(*rval, php_get_inf()); - } else if (!strncmp(start + 2, "-INF", 4)) { - ZVAL_DOUBLE(*rval, -php_get_inf()); + + if (!strncmp((char*)start + 2, "NAN", 3)) { + ZVAL_DOUBLE(rval, php_get_nan()); + } else if (!strncmp((char*)start + 2, "INF", 3)) { + ZVAL_DOUBLE(rval, php_get_inf()); + } else if (!strncmp((char*)start + 2, "-INF", 4)) { + ZVAL_DOUBLE(rval, -php_get_inf()); + } else { + ZVAL_NULL(rval); } return 1; } - #line 1164 "ext/standard/var_unserializer.c" -#line 1122 "ext/standard/var_unserializer.c" ++#line 1177 "ext/standard/var_unserializer.c" yy76: yych = *++YYCURSOR; if (yych == 'N') goto yy73; @@@ -1187,9 -1145,9 +1200,9 @@@ yy79 if (yych <= '9') goto yy79; if (yych != ';') goto yy18; ++YYCURSOR; - #line 595 "ext/standard/var_unserializer.re" -#line 548 "ext/standard/var_unserializer.re" ++#line 604 "ext/standard/var_unserializer.re" { -#if SIZEOF_LONG == 4 +#if SIZEOF_ZEND_LONG == 4 int digits = YYCURSOR - start - 3; if (start[2] == '-' || start[2] == '+') { @@@ -1210,10 -1168,11 +1223,10 @@@ } #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_LONG(*rval, parse_iv(start + 2)); + ZVAL_LONG(rval, parse_iv(start + 2)); return 1; } - #line 1217 "ext/standard/var_unserializer.c" -#line 1176 "ext/standard/var_unserializer.c" ++#line 1230 "ext/standard/var_unserializer.c" yy83: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@@ -1221,22 -1180,24 +1234,22 @@@ yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 589 "ext/standard/var_unserializer.re" -#line 541 "ext/standard/var_unserializer.re" ++#line 598 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_BOOL(*rval, parse_iv(start + 2)); + ZVAL_BOOL(rval, parse_iv(start + 2)); return 1; } - #line 1231 "ext/standard/var_unserializer.c" -#line 1191 "ext/standard/var_unserializer.c" ++#line 1244 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; - #line 583 "ext/standard/var_unserializer.re" -#line 534 "ext/standard/var_unserializer.re" ++#line 592 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_NULL(*rval); + ZVAL_NULL(rval); return 1; } - #line 1240 "ext/standard/var_unserializer.c" -#line 1201 "ext/standard/var_unserializer.c" ++#line 1253 "ext/standard/var_unserializer.c" yy89: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1259,9 -1220,9 +1272,9 @@@ yy91 if (yych <= '9') goto yy91; if (yych != ';') goto yy18; ++YYCURSOR; - #line 560 "ext/standard/var_unserializer.re" -#line 511 "ext/standard/var_unserializer.re" ++#line 569 "ext/standard/var_unserializer.re" { - long id; + zend_long id; *p = YYCURSOR; if (!var_hash) return 0; @@@ -1282,7 -1243,7 +1295,7 @@@ return 1; } - #line 1286 "ext/standard/var_unserializer.c" -#line 1247 "ext/standard/var_unserializer.c" ++#line 1299 "ext/standard/var_unserializer.c" yy95: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1305,9 -1266,9 +1318,9 @@@ yy97 if (yych <= '9') goto yy97; if (yych != ';') goto yy18; ++YYCURSOR; - #line 538 "ext/standard/var_unserializer.re" -#line 490 "ext/standard/var_unserializer.re" ++#line 547 "ext/standard/var_unserializer.re" { - long id; + zend_long id; *p = YYCURSOR; if (!var_hash) return 0; @@@ -1327,9 -1284,12 +1340,9 @@@ return 1; } - #line 1331 "ext/standard/var_unserializer.c" -#line 1291 "ext/standard/var_unserializer.c" ++#line 1344 "ext/standard/var_unserializer.c" } - #line 883 "ext/standard/var_unserializer.re" -#line 842 "ext/standard/var_unserializer.re" ++#line 895 "ext/standard/var_unserializer.re" return 0; diff --cc ext/standard/var_unserializer.re index be6a12f,8365b6c..35c46c0 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@@ -59,51 -53,51 +59,57 @@@ static inline void var_push(php_unseria (*var_hashx)->last = var_hash; } - var_hash->data[var_hash->used_slots++] = *rval; + var_hash->data[var_hash->used_slots++] = rval; } -PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval *rval) { - var_entries *var_hash; - - if (!var_hashx || !*var_hashx) { - return; - } - - var_hash = (*var_hashx)->last_dtor; -#if VAR_ENTRIES_DBG - fprintf(stderr, "var_push_dtor(%p, %ld): %d\n", *rval, var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval)); -#endif - - if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { - var_hash = emalloc(sizeof(var_entries)); - var_hash->used_slots = 0; - var_hash->next = 0; + zval *tmp_var = var_tmp_var(var_hashx); + if (!tmp_var) { + return; + } + ZVAL_COPY(tmp_var, rval); +} - if (!(*var_hashx)->first_dtor) { - (*var_hashx)->first_dtor = var_hash; - } else { - ((var_entries *) (*var_hashx)->last_dtor)->next = var_hash; - } +PHPAPI zval *var_tmp_var(php_unserialize_data_t *var_hashx) +{ + var_dtor_entries *var_hash; - (*var_hashx)->last_dtor = var_hash; - } + if (!var_hashx || !*var_hashx) { + return NULL; + } - Z_ADDREF_PP(rval); - var_hash->data[var_hash->used_slots++] = *rval; + var_hash = (*var_hashx)->last_dtor; + if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { + var_hash = emalloc(sizeof(var_dtor_entries)); + var_hash->used_slots = 0; + var_hash->next = 0; + + if (!(*var_hashx)->first_dtor) { + (*var_hashx)->first_dtor = var_hash; + } else { + ((var_dtor_entries *) (*var_hashx)->last_dtor)->next = var_hash; + } + + (*var_hashx)->last_dtor = var_hash; + } + ZVAL_UNDEF(&var_hash->data[var_hash->used_slots]); + return &var_hash->data[var_hash->used_slots++]; } -PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval) +//??? +#if 0 +PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rval) { - var_dtor_entries *var_hash = (*var_hashx)->last_dtor; + var_entries *var_hash; + + if (!var_hashx || !*var_hashx) { + return; + } + + var_hash = (*var_hashx)->last_dtor; #if VAR_ENTRIES_DBG - fprintf(stderr, "var_push_dtor_no_addref(%ld): %d (%d)\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval)); + fprintf(stderr, "var_push_dtor_no_addref(%p, %ld): %d (%d)\n", *rval, var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval)); #endif if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { @@@ -179,13 -172,18 +185,16 @@@ PHPAPI void var_destroy(php_unserialize var_hash = next; } - var_hash = (*var_hashx)->first_dtor; - - while (var_hash) { - for (i = 0; i < var_hash->used_slots; i++) { + while (var_dtor_hash) { + for (i = 0; i < var_dtor_hash->used_slots; i++) { + #if VAR_ENTRIES_DBG - fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_hash->data[i], Z_REFCOUNT_P(var_hash->data[i])); ++ fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_dtor_hash->data[i], Z_REFCOUNT_P(var_dtor_hash->data[i])); + #endif - zval_ptr_dtor(&var_hash->data[i]); + zval_ptr_dtor(&var_dtor_hash->data[i]); } - next = var_hash->next; - efree(var_hash); - var_hash = next; + next = var_dtor_hash->next; + efree_size(var_dtor_hash, sizeof(var_dtor_entries)); + var_dtor_hash = next; } } @@@ -699,9 -655,10 +708,10 @@@ use_double } "a:" uiv ":" "{" { - long elements = parse_iv(start + 2); + zend_long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ *p = YYCURSOR; + if (!var_hash) return 0; if (elements < 0) { return 0; @@@ -720,8 -676,9 +730,9 @@@ } "o:" iv ":" ["] { + if (!var_hash) return 0; - INIT_PZVAL(*rval); +//??? INIT_PZVAL(rval); return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); @@@ -737,10 -694,12 +748,11 @@@ object ":" uiv ":" ["] int custom_object = 0; - zval *user_func; - zval *retval_ptr; - zval **args[1]; - zval *arg_func_name; + zval user_func; + zval retval; + zval args[1]; + if (!var_hash) return 0; if (*start == 'C') { custom_object = 1; }
diff --cc Zend/zend_API.c index 0796ee9,ed56fef..8f288a7 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@@ -1217,58 -1169,6 +1217,67 @@@ ZEND_API void object_properties_init(ze } /* }}} */ +ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properties) /* {{{ */ +{ + object->properties = properties; + if (object->ce->default_properties_count) { + zval *prop; + zend_string *key; + zend_property_info *property_info; + + ZEND_HASH_FOREACH_STR_KEY_VAL(properties, key, prop) { + property_info = zend_get_property_info(object->ce, key, 1); + if (property_info != ZEND_WRONG_PROPERTY_INFO && + property_info && + (property_info->flags & ZEND_ACC_STATIC) == 0) { + zval *slot = OBJ_PROP(object, property_info->offset); + ZVAL_COPY_VALUE(slot, prop); + ZVAL_INDIRECT(prop, slot); + } + } ZEND_HASH_FOREACH_END(); + } +} +/* }}} */ + +ZEND_API void object_properties_load(zend_object *object, HashTable *properties) /* {{{ */ +{ + zval *prop, tmp; + zend_string *key; ++ zend_long h; + zend_property_info *property_info; + - ZEND_HASH_FOREACH_STR_KEY_VAL(properties, key, prop) { - property_info = zend_get_property_info(object->ce, key, 1); - if (property_info != ZEND_WRONG_PROPERTY_INFO && - property_info && - (property_info->flags & ZEND_ACC_STATIC) == 0) { - zval *slot = OBJ_PROP(object, property_info->offset); - zval_ptr_dtor(slot); - ZVAL_COPY_VALUE(slot, prop); - zval_add_ref(slot); - if (object->properties) { - ZVAL_INDIRECT(&tmp, slot); - zend_hash_update(object->properties, key, &tmp); ++ ZEND_HASH_FOREACH_KEY_VAL(properties, h, key, prop) { ++ if(key) { ++ property_info = zend_get_property_info(object->ce, key, 1); ++ if (property_info != ZEND_WRONG_PROPERTY_INFO && ++ property_info && ++ (property_info->flags & ZEND_ACC_STATIC) == 0) { ++ zval *slot = OBJ_PROP(object, property_info->offset); ++ zval_ptr_dtor(slot); ++ ZVAL_COPY_VALUE(slot, prop); ++ zval_add_ref(slot); ++ if (object->properties) { ++ ZVAL_INDIRECT(&tmp, slot); ++ zend_hash_update(object->properties, key, &tmp); ++ } ++ } else { ++ if (!object->properties) { ++ rebuild_object_properties(object); ++ } ++ prop = zend_hash_update(object->properties, key, prop); ++ zval_add_ref(prop); + } + } else { + if (!object->properties) { + rebuild_object_properties(object); + } - prop = zend_hash_update(object->properties, key, prop); ++ prop = zend_hash_index_update(object->properties, h, prop); + zval_add_ref(prop); + } + } ZEND_HASH_FOREACH_END(); +} +/* }}} */ + /* This function requires 'properties' to contain all props declared in the * class and all props being public. If only a subset is given or the class * has protected members then you need to merge the properties separately by diff --cc ext/gmp/gmp.c index 0cac3de,c7cdef7..191afdd --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@@ -585,44 -630,44 +585,42 @@@ static int gmp_unserialize(zval *object { mpz_ptr gmpnum; const unsigned char *p, *max; - zval zv; - zval *zv_ptr; ++ zval *zv; int retval = FAILURE; php_unserialize_data_t unserialize_data = (php_unserialize_data_t) data; - ZVAL_UNDEF(&zv); PHP_VAR_UNSERIALIZE_INIT(unserialize_data); - gmp_create_ex(*object, &gmpnum TSRMLS_CC); + gmp_create(object, &gmpnum); p = buf; max = buf + buf_len; - if (!php_var_unserialize(&zv, &p, max, &unserialize_data) - || Z_TYPE(zv) != IS_STRING - || convert_to_gmp(gmpnum, &zv, 10) == FAILURE - ALLOC_INIT_ZVAL(zv_ptr); - if (!php_var_unserialize(&zv_ptr, &p, max, &unserialize_data TSRMLS_CC) - || Z_TYPE_P(zv_ptr) != IS_STRING - || convert_to_gmp(gmpnum, zv_ptr, 10 TSRMLS_CC) == FAILURE ++ zv = var_tmp_var(&unserialize_data); ++ if (!php_var_unserialize(zv, &p, max, &unserialize_data) ++ || Z_TYPE_P(zv) != IS_STRING ++ || convert_to_gmp(gmpnum, zv, 10) == FAILURE ) { - zend_throw_exception(NULL, "Could not unserialize number", 0 TSRMLS_CC); + zend_throw_exception(NULL, "Could not unserialize number", 0); goto exit; } - zval_dtor(&zv); - ZVAL_UNDEF(&zv); - var_push_dtor_no_addref(&unserialize_data, &zv_ptr); - if (!php_var_unserialize(&zv, &p, max, &unserialize_data) - || Z_TYPE(zv) != IS_ARRAY - ALLOC_INIT_ZVAL(zv_ptr); - if (!php_var_unserialize(&zv_ptr, &p, max, &unserialize_data TSRMLS_CC) - || Z_TYPE_P(zv_ptr) != IS_ARRAY ++ zv = var_tmp_var(&unserialize_data); ++ if (!php_var_unserialize(zv, &p, max, &unserialize_data) ++ || Z_TYPE_P(zv) != IS_ARRAY ) { - zend_throw_exception(NULL, "Could not unserialize properties", 0 TSRMLS_CC); + zend_throw_exception(NULL, "Could not unserialize properties", 0); goto exit; } - if (zend_hash_num_elements(Z_ARRVAL(zv)) != 0) { - if (zend_hash_num_elements(Z_ARRVAL_P(zv_ptr)) != 0) { ++ if (zend_hash_num_elements(Z_ARRVAL_P(zv)) != 0) { zend_hash_copy( - zend_std_get_properties(object), Z_ARRVAL(zv), - zend_std_get_properties(*object TSRMLS_CC), Z_ARRVAL_P(zv_ptr), - (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *) ++ zend_std_get_properties(object), Z_ARRVAL_P(zv), + (copy_ctor_func_t) zval_add_ref ); } retval = SUCCESS; exit: - zval_dtor(&zv); - var_push_dtor_no_addref(&unserialize_data, &zv_ptr); PHP_VAR_UNSERIALIZE_DESTROY(unserialize_data); return retval; } diff --cc ext/gmp/tests/bug70284.phpt index 0000000,ab17c0f..58fc50c mode 000000,100644..100644 --- a/ext/gmp/tests/bug70284.phpt +++ b/ext/gmp/tests/bug70284.phpt @@@ -1,0 -1,50 +1,50 @@@ + --TEST-- + Bug #70284 (Use after free vulnerability in unserialize() with GMP) + --SKIPIF-- + <?php if (!extension_loaded("gmp")) print "skip"; ?> + --FILE-- + <?php + + $inner = 'r:2;a:1:{i:0;a:1:{i:0;r:4;}}'; + $exploit = 'a:2:{i:0;s:1:"1";i:1;C:3:"GMP":'.strlen($inner).':{'.$inner.'}}'; + + $data = unserialize($exploit); + + $fakezval = ptr2str(1122334455); + $fakezval .= ptr2str(0); + $fakezval .= "\x00\x00\x00\x00"; + $fakezval .= "\x01"; + $fakezval .= "\x00"; + $fakezval .= "\x00\x00"; + + for ($i = 0; $i < 5; $i++) { + $v[$i] = $fakezval.$i; + } + + var_dump($data); + + function ptr2str($ptr) + { + $out = ''; + for ($i = 0; $i < 8; $i++) { + $out .= chr($ptr & 0xff); + $ptr >>= 8; + } + return $out; + } + ?> + --EXPECTF-- + array(2) { + [0]=> + string(1) "1" + [1]=> + object(GMP)#%d (2) { + [0]=> + array(1) { + [0]=> - NULL ++ string(1) "1" + } + ["num"]=> + string(1) "1" + } + } diff --cc ext/pcre/php_pcre.c index 55ca8fa,36d913d..3ec6e62 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@@ -758,17 -709,11 +758,17 @@@ PHPAPI void php_pcre_match_impl(pcre_ca /* If subpatterns array has been passed, fill it in with values. */ if (subpats != NULL) { /* Try to get the list of substrings and display a warning if failed. */ - if (pcre_get_substring_list(subject, offsets, count, &stringlist) < 0) { + if ((offsets[1] - offsets[0] < 0) || pcre_get_substring_list(subject, offsets, count, &stringlist) < 0) { - efree(subpat_names); - efree(offsets); + if (subpat_names) { + efree(subpat_names); + } + if (size_offsets <= 32) { + free_alloca(offsets, use_heap); + } else { + efree(offsets); + } if (match_sets) efree(match_sets); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Get subpatterns list failed"); + php_error_docref(NULL, E_WARNING, "Get subpatterns list failed"); RETURN_FALSE; } @@@ -1176,12 -1170,10 +1176,12 @@@ PHPAPI zend_string *php_pcre_replace_im piece = subject + start_offset; - if (count > 0 && (offsets[1] - offsets[0] >= 0) && (limit == -1 || limit > 0)) { - if (replace_count) { + /* if (EXPECTED(count > 0 && (limit == -1 || limit > 0))) */ - if (EXPECTED(count > 0 && limit)) { ++ if (EXPECTED(count > 0 && (offsets[1] - offsets[0] >= 0) && limit)) { + if (UNEXPECTED(replace_count)) { ++*replace_count; } + /* Set the match location in subject */ match = subject + offsets[0]; diff --cc ext/session/session.c index ef17b86,56540ae..f2e1f7c --- a/ext/session/session.c +++ b/ext/session/session.c @@@ -62,8 -61,8 +62,9 @@@ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps) -static int php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra TSRMLS_DC); -static int (*php_session_rfc1867_orig_callback)(unsigned int event, void *event_data, void **extra TSRMLS_DC); +static int php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra); +static int (*php_session_rfc1867_orig_callback)(unsigned int event, void *event_data, void **extra); ++static void php_session_track_init(void); /* SessionHandler class */ zend_class_entry *php_session_class_entry; @@@ -135,12 -120,12 +136,13 @@@ static inline void php_rshutdown_sessio } /* }}} */ -static int php_session_destroy(TSRMLS_D) /* {{{ */ +static int php_session_destroy(void) /* {{{ */ { int retval = SUCCESS; ++ zend_string *var_name; if (PS(session_status) != php_session_active) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Trying to destroy uninitialized session"); + php_error_docref(NULL, E_WARNING, "Trying to destroy uninitialized session"); return FAILURE; } @@@ -227,15 -216,15 +229,16 @@@ static zend_string *php_session_encode( } /* }}} */ -static int php_session_decode(const char *val, int vallen TSRMLS_DC) /* {{{ */ +static int php_session_decode(zend_string *data) /* {{{ */ { if (!PS(serializer)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown session.serialize_handler. Failed to decode session object"); + php_error_docref(NULL, E_WARNING, "Unknown session.serialize_handler. Failed to decode session object"); return FAILURE; } - if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) { - php_session_destroy(TSRMLS_C); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode session object. Session has been destroyed"); + if (PS(serializer)->decode(ZSTR_VAL(data), ZSTR_LEN(data)) == FAILURE) { + php_session_destroy(); ++ php_session_track_init(); + php_error_docref(NULL, E_WARNING, "Failed to decode session object. Session has been destroyed"); return FAILURE; } return SUCCESS; @@@ -946,16 -946,17 +949,18 @@@ PS_SERIALIZER_DECODE_FUNC(php_binary) / } if (has_value) { - ALLOC_INIT_ZVAL(current); - if (php_var_unserialize(¤t, (const unsigned char **) &p, (const unsigned char *) endptr, &var_hash TSRMLS_CC)) { - php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); + ZVAL_UNDEF(¤t); + if (php_var_unserialize(¤t, (const unsigned char **) &p, (const unsigned char *) endptr, &var_hash)) { + zval *zv = php_set_session_var(name, ¤t, &var_hash ); + var_replace(&var_hash, ¤t, zv); } else { + zval_ptr_dtor(¤t); + PHP_VAR_UNSERIALIZE_DESTROY(var_hash); + return FAILURE; } - var_push_dtor_no_addref(&var_hash, ¤t); } - PS_ADD_VARL(name, namelen); - efree(name); + PS_ADD_VARL(name); + zend_string_release(name); } PHP_VAR_UNSERIALIZE_DESTROY(var_hash); @@@ -1036,17 -1041,20 +1041,19 @@@ PS_SERIALIZER_DECODE_FUNC(php) /* {{{ * } if (has_value) { - ALLOC_INIT_ZVAL(current); - if (php_var_unserialize(¤t, (const unsigned char **) &q, (const unsigned char *) endptr, &var_hash TSRMLS_CC)) { - php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); + ZVAL_UNDEF(¤t); + if (php_var_unserialize(¤t, (const unsigned char **) &q, (const unsigned char *) endptr, &var_hash)) { + zval *zv = php_set_session_var(name, ¤t, &var_hash); + var_replace(&var_hash, ¤t, zv); } else { - var_push_dtor_no_addref(&var_hash, ¤t); - efree(name); + zval_ptr_dtor(¤t); + PHP_VAR_UNSERIALIZE_DESTROY(var_hash); + return FAILURE; } - var_push_dtor_no_addref(&var_hash, ¤t); } - PS_ADD_VARL(name, namelen); + PS_ADD_VARL(name); skip: - efree(name); + zend_string_release(name); p = q; } @@@ -2168,11 -2073,7 +2175,10 @@@ static PHP_FUNCTION(session_decode return; } - RETVAL_BOOL(php_session_decode(str, str_len TSRMLS_CC) == SUCCESS); + if (php_session_decode(str) == FAILURE) { - /* FIXME: session_decode() should return FALSE */ - /* RETURN_FALSE; */ ++ RETURN_FALSE; + } + RETURN_TRUE; } /* }}} */ diff --cc ext/session/tests/session_decode_error2.phpt index 4160f87,515047b..30be587 --- a/ext/session/tests/session_decode_error2.phpt +++ b/ext/session/tests/session_decode_error2.phpt @@@ -18,6 -18,6 +18,7 @@@ $data = "foo|a:3:{i:0;i:1;i:1;i:2;i:2;i var_dump(session_start()); for($index = 0; $index < strlen($data); $index++) { ++ if(session_status() != PHP_SESSION_ACTIVE) { session_start(); } echo "\n-- Iteration $index --\n"; $encoded = substr($data, 0, $index); var_dump(session_decode($encoded)); @@@ -60,206 -60,148 +61,206 @@@ array(0) } -- Iteration 5 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 6 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 7 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 8 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 9 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 10 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 11 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 12 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 13 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 14 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 15 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 16 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 17 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 18 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 19 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 20 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 21 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 22 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 23 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 24 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 25 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 26 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 27 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 28 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 29 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 30 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 31 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 32 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 33 -- - bool(true) - array(1) { - ["foo"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 34 -- @@@ -333,67 -230,23 +334,31 @@@ array(1) } -- Iteration 39 -- - bool(true) - array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 40 -- - bool(true) - array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 41 -- - bool(true) - array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 42 -- - bool(true) - array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 43 -- @@@ -512,104 -275,25 +477,33 @@@ array(2) } -- Iteration 48 -- - bool(true) - array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 49 -- - bool(true) - array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 50 -- - bool(true) - array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } -- Iteration 51 -- - bool(true) - array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL ++ ++Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s/session_decode_error2.php on line %d + bool(false) + array(0) { } - bool(true) - Done + Warning: session_destroy(): Trying to destroy uninitialized session in %s/session_decode_error2.php on line %d + bool(false) + Done diff --cc ext/soap/soap.c index 3c4a86c,32420fd..d2b1d30 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@@ -1488,26 -1487,6 +1488,26 @@@ PHP_METHOD(SoapServer, addFunction } /* }}} */ +static void _soap_server_exception(soapServicePtr service, sdlFunctionPtr function, zval *this_ptr) /* {{{ */ +{ + zval exception_object; + + ZVAL_OBJ(&exception_object, EG(exception)); + if (instanceof_function(Z_OBJCE(exception_object), soap_fault_class_entry)) { + soap_server_fault_ex(function, &exception_object, NULL); + } else if (instanceof_function(Z_OBJCE(exception_object), zend_ce_error)) { + if (service->send_errors) { + zval rv; + zend_string *msg = zval_get_string(zend_read_property(zend_ce_error, &exception_object, "message", sizeof("message")-1, 0, &rv)); + add_soap_fault_ex(&exception_object, this_ptr, "Server", ZSTR_VAL(msg), NULL, NULL); + zend_string_release(msg); + } else { + add_soap_fault_ex(&exception_object, this_ptr, "Server", "Internal Error", NULL, NULL); + } + soap_server_fault_ex(function, &exception_object, NULL); - } ++ } +} +/* }}} */ /* {{{ proto void SoapServer::handle ( [string soap_request]) Handles a SOAP request */ @@@ -2915,20 -2909,26 +2915,22 @@@ PHP_METHOD(SoapClient, __call } /* Add default headers */ - if (zend_hash_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers"), (void **) &tmp) == SUCCESS && Z_TYPE_PP(tmp) == IS_ARRAY) { - HashTable *default_headers = Z_ARRVAL_P(*tmp); + this_ptr = getThis(); + if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_ARRAY) { + HashTable *default_headers = Z_ARRVAL_P(tmp); if (soap_headers) { if (!free_soap_headers) { - HashTable *t = emalloc(sizeof(HashTable)); - zend_hash_init(t, 0, NULL, ZVAL_PTR_DTOR, 0); - zend_hash_copy(t, soap_headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - soap_headers = t; + soap_headers = zend_array_dup(soap_headers); free_soap_headers = 1; } - zend_hash_internal_pointer_reset(default_headers); - while (zend_hash_get_current_data(default_headers, (void**)&tmp) == SUCCESS) { - if(Z_TYPE_PP(tmp) == IS_OBJECT) { - Z_ADDREF_PP(tmp); - zend_hash_next_index_insert(soap_headers, tmp, sizeof(zval *), NULL); + ZEND_HASH_FOREACH_VAL(default_headers, tmp) { - Z_ADDREF_P(tmp); - zend_hash_next_index_insert(soap_headers, tmp); ++ if(Z_TYPE_P(tmp) == IS_OBJECT) { ++ Z_ADDREF_P(tmp); ++ zend_hash_next_index_insert(soap_headers, tmp); + } - zend_hash_move_forward(default_headers); - } + } ZEND_HASH_FOREACH_END(); } else { - soap_headers = Z_ARRVAL_P(*tmp); + soap_headers = Z_ARRVAL_P(tmp); free_soap_headers = 0; } } @@@ -4329,16 -4346,24 +4331,21 @@@ static xmlDocPtr serialize_function_cal } if (head) { - zval** header; + zval* header; - for(zend_hash_internal_pointer_reset(soap_headers); - zend_hash_get_current_data(soap_headers,(void**)&header) == SUCCESS; - zend_hash_move_forward(soap_headers) - ) { + ZEND_HASH_FOREACH_VAL(soap_headers, header) { - HashTable *ht = Z_OBJPROP_P(header); + HashTable *ht; - zval **name, **ns, **tmp; + zval *name, *ns, *tmp; - if (Z_TYPE_PP(header) != IS_OBJECT) { ++ if (Z_TYPE_P(header) != IS_OBJECT) { + continue; + } + - ht = Z_OBJPROP_PP(header); - if (zend_hash_find(ht, "name", sizeof("name"), (void**)&name) == SUCCESS && - Z_TYPE_PP(name) == IS_STRING && - zend_hash_find(ht, "namespace", sizeof("namespace"), (void**)&ns) == SUCCESS && - Z_TYPE_PP(ns) == IS_STRING) { ++ ht = Z_OBJPROP_P(header); + if ((name = zend_hash_str_find(ht, "name", sizeof("name")-1)) != NULL && + Z_TYPE_P(name) == IS_STRING && + (ns = zend_hash_str_find(ht, "namespace", sizeof("namespace")-1)) != NULL && + Z_TYPE_P(ns) == IS_STRING) { xmlNodePtr h; xmlNsPtr nsptr; int hdr_use = SOAP_LITERAL; diff --cc ext/spl/spl_dllist.c index 210bcdf,66c273a..d7976f3 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@@ -1206,12 -1214,14 +1206,13 @@@ SPL_METHOD(SplDoublyLinkedList, unseria /* elements */ while(*p == ':') { ++p; - ALLOC_INIT_ZVAL(elem); - if (!php_var_unserialize(&elem, &p, s + buf_len, &var_hash TSRMLS_CC)) { - zval_ptr_dtor(&elem); + elem = var_tmp_var(&var_hash); + if (!php_var_unserialize(elem, &p, s + buf_len, &var_hash)) { goto error; } - var_push_dtor(&var_hash, &elem); ++ var_push_dtor(&var_hash, elem); - spl_ptr_llist_push(intern->llist, elem TSRMLS_CC); + spl_ptr_llist_push(intern->llist, elem); } if (*p != '\0') { diff --cc ext/standard/tests/serialize/bug70172_2.phpt index 0000000,ae48341..1fc97a9 mode 000000,100644..100644 --- a/ext/standard/tests/serialize/bug70172_2.phpt +++ b/ext/standard/tests/serialize/bug70172_2.phpt @@@ -1,0 -1,68 +1,68 @@@ + --TEST-- + Bug #70172 - Use After Free Vulnerability in unserialize() + --FILE-- + <?php + class obj implements Serializable { + var $data; + function serialize() { + return serialize($this->data); + } + function unserialize($data) { + $this->data = unserialize($data); + } + } + + class obj2 { + var $ryat; + function __wakeup() { + $this->ryat = 1; + } + } + + $fakezval = ptr2str(1122334455); + $fakezval .= ptr2str(0); + $fakezval .= "\x00\x00\x00\x00"; + $fakezval .= "\x01"; + $fakezval .= "\x00"; + $fakezval .= "\x00\x00"; + + $inner = 'r:2;'; + $exploit = 'a:2:{i:0;O:4:"obj2":1:{s:4:"ryat";C:3:"obj":'.strlen($inner).':{'.$inner.'}}i:1;a:1:{i:0;a:1:{i:0;R:4;}}}'; + + $data = unserialize($exploit); + + for ($i = 0; $i < 5; $i++) { + $v[$i] = $fakezval.$i; + } + + var_dump($data); + + function ptr2str($ptr) + { + $out = ''; + for ($i = 0; $i < 8; $i++) { + $out .= chr($ptr & 0xff); + $ptr >>= 8; + } + return $out; + } + ?> + --EXPECTF-- + array(2) { + [0]=> + object(obj2)#%d (1) { + ["ryat"]=> + int(1) + } + [1]=> + array(1) { + [0]=> + array(1) { + [0]=> - object(obj2)#%d (1) { ++ &object(obj2)#%d (1) { + ["ryat"]=> + int(1) + } + } + } + } diff --cc ext/standard/tests/serialize/bug70219.phpt index 0000000,84a059f..da2a0f2 mode 000000,100644..100644 --- a/ext/standard/tests/serialize/bug70219.phpt +++ b/ext/standard/tests/serialize/bug70219.phpt @@@ -1,0 -1,38 +1,40 @@@ + --TEST-- + Bug #70219 Use after free vulnerability in session deserializer + --FILE-- + <?php + class obj implements Serializable { + var $data; + function serialize() { + return serialize($this->data); + } + function unserialize($data) { + session_start(); + session_decode($data); + } + } + + $inner = 'ryat|a:1:{i:0;a:1:{i:1;'; + $exploit = 'a:2:{i:0;C:3:"obj":'.strlen($inner).':{'.$inner.'}i:1;R:4;}'; + + $data = unserialize($exploit); + + for ($i = 0; $i < 5; $i++) { + $v[$i] = 'hi'.$i; + } + + var_dump($data); + ?> + --EXPECTF-- + Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d + array(2) { + [0]=> + object(obj)#%d (1) { + ["data"]=> + NULL + } + [1]=> - array(0) { ++ &array(1) { ++ ["data"]=> ++ NULL + } + } diff --cc ext/standard/var.c index 40b5acb,8d8f68a..8b0f889 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@@ -1040,13 -945,13 +1040,14 @@@ PHP_FUNCTION(serialize PHP_FUNCTION(unserialize) { char *buf = NULL; - int buf_len; + size_t buf_len; const unsigned char *p; php_unserialize_data_t var_hash; - int oldlevel; + zval *options = NULL, *classes = NULL; + HashTable *class_hash = NULL; + zval *old_rval = return_value; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|a", &buf, &buf_len, &options) == FAILURE) { RETURN_FALSE; } diff --cc ext/standard/var_unserializer.c index 046db56,575070b..43e82d2 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -61,51 -55,51 +61,57 @@@ static inline void var_push(php_unseria (*var_hashx)->last = var_hash; } - var_hash->data[var_hash->used_slots++] = *rval; + var_hash->data[var_hash->used_slots++] = rval; } -PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval *rval) { - var_entries *var_hash; - - if (!var_hashx || !*var_hashx) { - return; - } - - var_hash = (*var_hashx)->last_dtor; -#if VAR_ENTRIES_DBG - fprintf(stderr, "var_push_dtor(%p, %ld): %d\n", *rval, var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval)); -#endif - - if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { - var_hash = emalloc(sizeof(var_entries)); - var_hash->used_slots = 0; - var_hash->next = 0; + zval *tmp_var = var_tmp_var(var_hashx); + if (!tmp_var) { + return; + } + ZVAL_COPY(tmp_var, rval); +} - if (!(*var_hashx)->first_dtor) { - (*var_hashx)->first_dtor = var_hash; - } else { - ((var_entries *) (*var_hashx)->last_dtor)->next = var_hash; - } +PHPAPI zval *var_tmp_var(php_unserialize_data_t *var_hashx) +{ + var_dtor_entries *var_hash; - (*var_hashx)->last_dtor = var_hash; - } + if (!var_hashx || !*var_hashx) { + return NULL; + } - Z_ADDREF_PP(rval); - var_hash->data[var_hash->used_slots++] = *rval; + var_hash = (*var_hashx)->last_dtor; + if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { + var_hash = emalloc(sizeof(var_dtor_entries)); + var_hash->used_slots = 0; + var_hash->next = 0; + + if (!(*var_hashx)->first_dtor) { + (*var_hashx)->first_dtor = var_hash; + } else { + ((var_dtor_entries *) (*var_hashx)->last_dtor)->next = var_hash; + } + + (*var_hashx)->last_dtor = var_hash; + } + ZVAL_UNDEF(&var_hash->data[var_hash->used_slots]); + return &var_hash->data[var_hash->used_slots++]; } -PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval) +//??? +#if 0 +PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rval) { - var_dtor_entries *var_hash = (*var_hashx)->last_dtor; + var_entries *var_hash; + + if (!var_hashx || !*var_hashx) { + return; + } + + var_hash = (*var_hashx)->last_dtor; #if VAR_ENTRIES_DBG - fprintf(stderr, "var_push_dtor_no_addref(%ld): %d (%d)\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval)); + fprintf(stderr, "var_push_dtor_no_addref(%p, %ld): %d (%d)\n", *rval, var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval)); #endif if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { @@@ -181,13 -174,18 +187,16 @@@ PHPAPI void var_destroy(php_unserialize var_hash = next; } - var_hash = (*var_hashx)->first_dtor; - - while (var_hash) { - for (i = 0; i < var_hash->used_slots; i++) { + while (var_dtor_hash) { + for (i = 0; i < var_dtor_hash->used_slots; i++) { + #if VAR_ENTRIES_DBG - fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_hash->data[i], Z_REFCOUNT_P(var_hash->data[i])); ++ fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_dtor_hash->data[i], Z_REFCOUNT_P(var_dtor_hash->data[i])); + #endif - zval_ptr_dtor(&var_hash->data[i]); + zval_ptr_dtor(&var_dtor_hash->data[i]); } - next = var_hash->next; - efree(var_hash); - var_hash = next; + next = var_dtor_hash->next; + efree_size(var_dtor_hash, sizeof(var_dtor_entries)); + var_dtor_hash = next; } } @@@ -263,7 -241,7 +272,7 @@@ static inline int unserialize_allowed_c #define YYMARKER marker - #line 271 "ext/standard/var_unserializer.re" -#line 249 "ext/standard/var_unserializer.re" ++#line 280 "ext/standard/var_unserializer.re" @@@ -530,7 -480,9 +539,7 @@@ PHPAPI int php_var_unserialize_ex(UNSER start = cursor; - #line 534 "ext/standard/var_unserializer.c" - - -#line 486 "ext/standard/var_unserializer.c" ++#line 543 "ext/standard/var_unserializer.c" { YYCTYPE yych; static const unsigned char yybm[] = { @@@ -590,9 -542,9 +599,9 @@@ yy2 yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy95; yy3: - #line 881 "ext/standard/var_unserializer.re" -#line 840 "ext/standard/var_unserializer.re" ++#line 893 "ext/standard/var_unserializer.re" { return 0; } - #line 596 "ext/standard/var_unserializer.c" -#line 548 "ext/standard/var_unserializer.c" ++#line 605 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy89; @@@ -635,13 -587,13 +644,13 @@@ yy13 goto yy3; yy14: ++YYCURSOR; - #line 875 "ext/standard/var_unserializer.re" -#line 834 "ext/standard/var_unserializer.re" ++#line 887 "ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); + php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } - #line 645 "ext/standard/var_unserializer.c" -#line 597 "ext/standard/var_unserializer.c" ++#line 654 "ext/standard/var_unserializer.c" yy16: yych = *++YYCURSOR; goto yy3; @@@ -671,21 -624,23 +681,22 @@@ yy20 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 730 "ext/standard/var_unserializer.re" -#line 687 "ext/standard/var_unserializer.re" ++#line 741 "ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; - long elements; - char *class_name; + zend_long elements; + char *str; + zend_string *class_name; zend_class_entry *ce; - zend_class_entry **pce; int incomplete_class = 0; int custom_object = 0; - zval *user_func; - zval *retval_ptr; - zval **args[1]; - zval *arg_func_name; + zval user_func; + zval retval; + zval args[1]; + if (!var_hash) return 0; if (*start == 'C') { custom_object = 1; } @@@ -816,7 -771,7 +827,7 @@@ return object_common2(UNSERIALIZE_PASSTHRU, elements); } - #line 820 "ext/standard/var_unserializer.c" -#line 775 "ext/standard/var_unserializer.c" ++#line 831 "ext/standard/var_unserializer.c" yy25: yych = *++YYCURSOR; if (yych <= ',') { @@@ -841,15 -796,16 +852,16 @@@ yy27 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 722 "ext/standard/var_unserializer.re" -#line 678 "ext/standard/var_unserializer.re" ++#line 732 "ext/standard/var_unserializer.re" { + if (!var_hash) return 0; - INIT_PZVAL(*rval); +//??? INIT_PZVAL(rval); return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } - #line 853 "ext/standard/var_unserializer.c" -#line 809 "ext/standard/var_unserializer.c" ++#line 865 "ext/standard/var_unserializer.c" yy32: yych = *++YYCURSOR; if (yych == '+') goto yy33; @@@ -870,11 -826,12 +882,12 @@@ yy34 yych = *++YYCURSOR; if (yych != '{') goto yy18; ++YYCURSOR; - #line 701 "ext/standard/var_unserializer.re" -#line 657 "ext/standard/var_unserializer.re" ++#line 710 "ext/standard/var_unserializer.re" { - long elements = parse_iv(start + 2); + zend_long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ *p = YYCURSOR; + if (!var_hash) return 0; if (elements < 0) { return 0; @@@ -891,7 -847,7 +904,7 @@@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } - #line 895 "ext/standard/var_unserializer.c" -#line 851 "ext/standard/var_unserializer.c" ++#line 908 "ext/standard/var_unserializer.c" yy39: yych = *++YYCURSOR; if (yych == '+') goto yy40; @@@ -912,10 -868,10 +925,10 @@@ yy41 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 673 "ext/standard/var_unserializer.re" -#line 628 "ext/standard/var_unserializer.re" ++#line 682 "ext/standard/var_unserializer.re" { size_t len, maxlen; - char *str; + zend_string *str; len = parse_uiv(start + 2); maxlen = max - YYCURSOR; @@@ -937,10 -893,11 +950,10 @@@ YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 0); + ZVAL_STR(rval, str); return 1; } - #line 944 "ext/standard/var_unserializer.c" -#line 901 "ext/standard/var_unserializer.c" ++#line 957 "ext/standard/var_unserializer.c" yy46: yych = *++YYCURSOR; if (yych == '+') goto yy47; @@@ -961,7 -918,7 +974,7 @@@ yy48 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 646 "ext/standard/var_unserializer.re" -#line 600 "ext/standard/var_unserializer.re" ++#line 655 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@@ -985,10 -942,11 +998,10 @@@ YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 1); + ZVAL_STRINGL(rval, str, len); return 1; } - #line 992 "ext/standard/var_unserializer.c" -#line 950 "ext/standard/var_unserializer.c" ++#line 1005 "ext/standard/var_unserializer.c" yy53: yych = *++YYCURSOR; if (yych <= '/') { @@@ -1076,16 -1034,17 +1089,16 @@@ yy61 } yy63: ++YYCURSOR; - #line 637 "ext/standard/var_unserializer.re" -#line 590 "ext/standard/var_unserializer.re" ++#line 646 "ext/standard/var_unserializer.re" { -#if SIZEOF_LONG == 4 +#if SIZEOF_ZEND_LONG == 4 use_double: #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); + ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL)); return 1; } - #line 1089 "ext/standard/var_unserializer.c" -#line 1048 "ext/standard/var_unserializer.c" ++#line 1102 "ext/standard/var_unserializer.c" yy65: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1144,23 -1103,22 +1157,23 @@@ yy73 yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 621 "ext/standard/var_unserializer.re" -#line 575 "ext/standard/var_unserializer.re" ++#line 630 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - - if (!strncmp(start + 2, "NAN", 3)) { - ZVAL_DOUBLE(*rval, php_get_nan()); - } else if (!strncmp(start + 2, "INF", 3)) { - ZVAL_DOUBLE(*rval, php_get_inf()); - } else if (!strncmp(start + 2, "-INF", 4)) { - ZVAL_DOUBLE(*rval, -php_get_inf()); + + if (!strncmp((char*)start + 2, "NAN", 3)) { + ZVAL_DOUBLE(rval, php_get_nan()); + } else if (!strncmp((char*)start + 2, "INF", 3)) { + ZVAL_DOUBLE(rval, php_get_inf()); + } else if (!strncmp((char*)start + 2, "-INF", 4)) { + ZVAL_DOUBLE(rval, -php_get_inf()); + } else { + ZVAL_NULL(rval); } return 1; } - #line 1164 "ext/standard/var_unserializer.c" -#line 1122 "ext/standard/var_unserializer.c" ++#line 1177 "ext/standard/var_unserializer.c" yy76: yych = *++YYCURSOR; if (yych == 'N') goto yy73; @@@ -1187,9 -1145,9 +1200,9 @@@ yy79 if (yych <= '9') goto yy79; if (yych != ';') goto yy18; ++YYCURSOR; - #line 595 "ext/standard/var_unserializer.re" -#line 548 "ext/standard/var_unserializer.re" ++#line 604 "ext/standard/var_unserializer.re" { -#if SIZEOF_LONG == 4 +#if SIZEOF_ZEND_LONG == 4 int digits = YYCURSOR - start - 3; if (start[2] == '-' || start[2] == '+') { @@@ -1210,10 -1168,11 +1223,10 @@@ } #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_LONG(*rval, parse_iv(start + 2)); + ZVAL_LONG(rval, parse_iv(start + 2)); return 1; } - #line 1217 "ext/standard/var_unserializer.c" -#line 1176 "ext/standard/var_unserializer.c" ++#line 1230 "ext/standard/var_unserializer.c" yy83: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@@ -1221,22 -1180,24 +1234,22 @@@ yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 589 "ext/standard/var_unserializer.re" -#line 541 "ext/standard/var_unserializer.re" ++#line 598 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_BOOL(*rval, parse_iv(start + 2)); + ZVAL_BOOL(rval, parse_iv(start + 2)); return 1; } - #line 1231 "ext/standard/var_unserializer.c" -#line 1191 "ext/standard/var_unserializer.c" ++#line 1244 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; - #line 583 "ext/standard/var_unserializer.re" -#line 534 "ext/standard/var_unserializer.re" ++#line 592 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_NULL(*rval); + ZVAL_NULL(rval); return 1; } - #line 1240 "ext/standard/var_unserializer.c" -#line 1201 "ext/standard/var_unserializer.c" ++#line 1253 "ext/standard/var_unserializer.c" yy89: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1259,9 -1220,9 +1272,9 @@@ yy91 if (yych <= '9') goto yy91; if (yych != ';') goto yy18; ++YYCURSOR; - #line 560 "ext/standard/var_unserializer.re" -#line 511 "ext/standard/var_unserializer.re" ++#line 569 "ext/standard/var_unserializer.re" { - long id; + zend_long id; *p = YYCURSOR; if (!var_hash) return 0; @@@ -1282,7 -1243,7 +1295,7 @@@ return 1; } - #line 1286 "ext/standard/var_unserializer.c" -#line 1247 "ext/standard/var_unserializer.c" ++#line 1299 "ext/standard/var_unserializer.c" yy95: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1305,9 -1266,9 +1318,9 @@@ yy97 if (yych <= '9') goto yy97; if (yych != ';') goto yy18; ++YYCURSOR; - #line 538 "ext/standard/var_unserializer.re" -#line 490 "ext/standard/var_unserializer.re" ++#line 547 "ext/standard/var_unserializer.re" { - long id; + zend_long id; *p = YYCURSOR; if (!var_hash) return 0; @@@ -1327,9 -1284,12 +1340,9 @@@ return 1; } - #line 1331 "ext/standard/var_unserializer.c" -#line 1291 "ext/standard/var_unserializer.c" ++#line 1344 "ext/standard/var_unserializer.c" } - #line 883 "ext/standard/var_unserializer.re" -#line 842 "ext/standard/var_unserializer.re" ++#line 895 "ext/standard/var_unserializer.re" return 0; diff --cc ext/standard/var_unserializer.re index be6a12f,8365b6c..35c46c0 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@@ -59,51 -53,51 +59,57 @@@ static inline void var_push(php_unseria (*var_hashx)->last = var_hash; } - var_hash->data[var_hash->used_slots++] = *rval; + var_hash->data[var_hash->used_slots++] = rval; } -PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval *rval) { - var_entries *var_hash; - - if (!var_hashx || !*var_hashx) { - return; - } - - var_hash = (*var_hashx)->last_dtor; -#if VAR_ENTRIES_DBG - fprintf(stderr, "var_push_dtor(%p, %ld): %d\n", *rval, var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval)); -#endif - - if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { - var_hash = emalloc(sizeof(var_entries)); - var_hash->used_slots = 0; - var_hash->next = 0; + zval *tmp_var = var_tmp_var(var_hashx); + if (!tmp_var) { + return; + } + ZVAL_COPY(tmp_var, rval); +} - if (!(*var_hashx)->first_dtor) { - (*var_hashx)->first_dtor = var_hash; - } else { - ((var_entries *) (*var_hashx)->last_dtor)->next = var_hash; - } +PHPAPI zval *var_tmp_var(php_unserialize_data_t *var_hashx) +{ + var_dtor_entries *var_hash; - (*var_hashx)->last_dtor = var_hash; - } + if (!var_hashx || !*var_hashx) { + return NULL; + } - Z_ADDREF_PP(rval); - var_hash->data[var_hash->used_slots++] = *rval; + var_hash = (*var_hashx)->last_dtor; + if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { + var_hash = emalloc(sizeof(var_dtor_entries)); + var_hash->used_slots = 0; + var_hash->next = 0; + + if (!(*var_hashx)->first_dtor) { + (*var_hashx)->first_dtor = var_hash; + } else { + ((var_dtor_entries *) (*var_hashx)->last_dtor)->next = var_hash; + } + + (*var_hashx)->last_dtor = var_hash; + } + ZVAL_UNDEF(&var_hash->data[var_hash->used_slots]); + return &var_hash->data[var_hash->used_slots++]; } -PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval) +//??? +#if 0 +PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rval) { - var_dtor_entries *var_hash = (*var_hashx)->last_dtor; + var_entries *var_hash; + + if (!var_hashx || !*var_hashx) { + return; + } + + var_hash = (*var_hashx)->last_dtor; #if VAR_ENTRIES_DBG - fprintf(stderr, "var_push_dtor_no_addref(%ld): %d (%d)\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval)); + fprintf(stderr, "var_push_dtor_no_addref(%p, %ld): %d (%d)\n", *rval, var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval)); #endif if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) { @@@ -179,13 -172,18 +185,16 @@@ PHPAPI void var_destroy(php_unserialize var_hash = next; } - var_hash = (*var_hashx)->first_dtor; - - while (var_hash) { - for (i = 0; i < var_hash->used_slots; i++) { + while (var_dtor_hash) { + for (i = 0; i < var_dtor_hash->used_slots; i++) { + #if VAR_ENTRIES_DBG - fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_hash->data[i], Z_REFCOUNT_P(var_hash->data[i])); ++ fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_dtor_hash->data[i], Z_REFCOUNT_P(var_dtor_hash->data[i])); + #endif - zval_ptr_dtor(&var_hash->data[i]); + zval_ptr_dtor(&var_dtor_hash->data[i]); } - next = var_hash->next; - efree(var_hash); - var_hash = next; + next = var_dtor_hash->next; + efree_size(var_dtor_hash, sizeof(var_dtor_entries)); + var_dtor_hash = next; } } @@@ -699,9 -655,10 +708,10 @@@ use_double } "a:" uiv ":" "{" { - long elements = parse_iv(start + 2); + zend_long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ *p = YYCURSOR; + if (!var_hash) return 0; if (elements < 0) { return 0; @@@ -720,8 -676,9 +730,9 @@@ } "o:" iv ":" ["] { + if (!var_hash) return 0; - INIT_PZVAL(*rval); +//??? INIT_PZVAL(rval); return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); @@@ -737,10 -694,12 +748,11 @@@ object ":" uiv ":" ["] int custom_object = 0; - zval *user_func; - zval *retval_ptr; - zval **args[1]; - zval *arg_func_name; + zval user_func; + zval retval; + zval args[1]; + if (!var_hash) return 0; if (*start == 'C') { custom_object = 1; }