com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/exif/exif.c ext/session/session.c ext/standard/base64.c ext/standard/quot _print.c
ext/standard/uuencode.c ext/standard/var_u nserializer.c ext/wddx/wddx.c
| From: | Stanislav Malyshev | Date: | Wed, 17 Aug 2016 07:43:33 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/exif/exif.c ext/session/session.c ext/standard/base64.c ext/standard/quot _print.c ext/standard/uuencode.c ext/standard/var_u nserializer.c ext/wddx/wddx.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93848@lists.php.net to get a copy of this message | ||
Commit: 0d13325b660b5ae64267dffcc9a153c7634fdfe2
Author: Stanislav Malyshev <stas@php.net> Wed, 17 Aug 2016 00:23:51 -0700
Parents: 75d7666968573a0abea36b46aae2b0c0ad6eb488 9e00ad2b091f3bbb6e34656c06eb7601fbadb7ce
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0d13325b660b5ae64267dffcc9a153c7634fdfe2
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: (24 commits)
Update NEWS
BLock test with memory leak
fix tests
Fix TSRM build
Fix bug #72850 - integer overflow in uuencode
Fixed bug #72849 - integer overflow in urlencode
Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase
Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
Fix bug #72836 - integer overflow in base64_decode caused heap corruption
Fix for bug #72807 - do not produce strings with negative length
Fix for bug #72790 and bug #72799
Fix bug #72730 - imagegammacorrect allows arbitrary write access
Fix bug#72697 - select_colors write out-of-bounds
Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF
Fix bug #72750: wddx_deserialize null dereference
Fix bug #72771: ftps:// opendir wrapper is vulnerable to protocol downgrade attack
Improve fix for #72663
Fix bug #70436: Use After Free Vulnerability in unserialize()
Fix bug #72749: wddx_deserialize allows illegal memory access
...
Conflicts:
Zend/zend_API.h
ext/bz2/bz2.c
ext/curl/interface.c
ext/ereg/ereg.c
ext/exif/exif.c
ext/gd/gd.c
ext/gd/tests/imagetruecolortopalette_error3.phpt
ext/gd/tests/imagetruecolortopalette_error4..phpt
ext/session/session.c
ext/snmp/snmp.c
ext/standard/base64.c
ext/standard/ftp_fopen_wrapper.c
ext/standard/quot_print.c
ext/standard/url.c
ext/standard/uuencode.c
ext/standard/var..c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/wddx/tests/bug72790.phpt
ext/wddx/tests/bug72799.phpt
ext/wddx/wddx.c
sapi/cli/generate_mime_type_map.php
Bugs:
https://bugs.php.net/72850
https://bugs.php.net/72849
https://bugs.php.net/72848
https://bugs.php.net/72838
https://bugs.php.net/72837
https://bugs.php.net/72836
https://bugs.php.net/72807
https://bugs.php.net/72790
https://bugs.php.net/72799
https://bugs.php.net/72730
https://bugs..php.net/72697
https://bugs.php.net/72627
https://bugs.php.net/72750
https://bugs.php.net/72771
https://bugs.php.net/72663
https://bugs.php.net/70436
https://bugs.php.net/72749
Changed paths:
MM ext/exif/exif.c
MM ext/session/session.c
MM ext/standard/base64.c
MM ext/standard/quot_print.c
MM ext/standard/uuencode.c
MM ext/standard/var_unserializer.c
MM ext/wddx/wddx.c
diff --cc ext/exif/exif.c index 2594cad,657a2cc..f0c631e --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@@ -3760,9 -3771,8 +3760,8 @@@ static int exif_process_IFD_in_TIFF(ima efree(ImageInfo->Thumbnail.data); ImageInfo->Thumbnail.data = NULL; } else { - exif_thumbnail_build(ImageInfo TSRMLS_CC); + exif_thumbnail_build(ImageInfo); } - exif_thumbnail_build(ImageInfo); } #ifdef EXIF_DEBUG exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Read next IFD (THUMBNAIL) done"); diff --cc ext/session/session.c index 380cad5,b2d0236..48cd0f1 --- a/ext/session/session.c +++ b/ext/session/session.c @@@ -958,16 -918,19 +958,18 @@@ PS_SERIALIZER_ENCODE_FUNC(php_binary) / PS_SERIALIZER_DECODE_FUNC(php_binary) /* {{{ */ { const char *p; - char *name; const char *endptr = val + vallen; - zval *current; - int namelen; int has_value; + int namelen; + zend_string *name; php_unserialize_data_t var_hash; + int skip = 0; PHP_VAR_UNSERIALIZE_INIT(var_hash); for (p = val; p < endptr; ) { - zval **tmp; + zval *tmp; + skip = 0; namelen = ((unsigned char)(*p)) & (~PS_BIN_UNDEF); if (namelen < 0 || namelen > PS_BIN_MAX || (p + namelen) >= endptr) { @@@ -981,23 -944,19 +983,24 @@@ p += namelen + 1; - if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void **) &tmp) == SUCCESS) { - if ((Z_TYPE_PP(tmp) == IS_ARRAY && Z_ARRVAL_PP(tmp) == &EG(symbol_table)) || *tmp == PS(http_session_vars)) { + if ((tmp = zend_hash_find(&EG(symbol_table), name))) { + if ((Z_TYPE_P(tmp) == IS_ARRAY && + Z_ARRVAL_P(tmp) == &EG(symbol_table)) || tmp == &PS(http_session_vars)) { - zend_string_release(name); - continue; + skip = 1; } } if (has_value) { - ALLOC_INIT_ZVAL(current); - if (php_var_unserialize(¤t, (const unsigned char **) &p, (const unsigned char *) endptr, &var_hash TSRMLS_CC)) { + zval *current, rv; + current = var_tmp_var(&var_hash); + if (php_var_unserialize(current, (const unsigned char **) &p, (const unsigned char *) endptr, &var_hash)) { + ZVAL_PTR(&rv, current); - php_set_session_var(name, &rv, &var_hash ); + if (!skip) { - php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); ++ php_set_session_var(name, &rv, &var_hash); + } } else { + zend_string_release(name); + php_session_normalize_vars(); PHP_VAR_UNSERIALIZE_DESTROY(var_hash); return FAILURE; } @@@ -1051,19 -1015,22 +1054,21 @@@ PS_SERIALIZER_ENCODE_FUNC(php) /* {{{ * PS_SERIALIZER_DECODE_FUNC(php) /* {{{ */ { const char *p, *q; - char *name; const char *endptr = val + vallen; - zval *current; - int namelen; - int has_value; + ptrdiff_t namelen; + zend_string *name; + int has_value, retval = SUCCESS; php_unserialize_data_t var_hash; + int skip = 0; PHP_VAR_UNSERIALIZE_INIT(var_hash); p = val; while (p < endptr) { - zval **tmp; + zval *tmp; q = p; + skip = 0; while (*q != PS_DELIMITER) { if (++q >= endptr) goto break_outer_loop; } @@@ -1075,32 -1042,34 +1080,36 @@@ } namelen = q - p; - name = estrndup(p, namelen); + name = zend_string_init(p, namelen, 0); q++; - if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void **) &tmp) == SUCCESS) { - if ((Z_TYPE_PP(tmp) == IS_ARRAY && Z_ARRVAL_PP(tmp) == &EG(symbol_table)) || *tmp == PS(http_session_vars)) { + if ((tmp = zend_hash_find(&EG(symbol_table), name))) { + if ((Z_TYPE_P(tmp) == IS_ARRAY && + Z_ARRVAL_P(tmp) == &EG(symbol_table)) || tmp == &PS(http_session_vars)) { - goto skip; + skip = 1; } } if (has_value) { - ALLOC_INIT_ZVAL(current); - if (php_var_unserialize(¤t, (const unsigned char **) &q, (const unsigned char *) endptr, &var_hash TSRMLS_CC)) { + zval *current, rv; + current = var_tmp_var(&var_hash); + if (php_var_unserialize(current, (const unsigned char **)&q, (const unsigned char *)endptr, &var_hash)) { + ZVAL_PTR(&rv, current); - php_set_session_var(name, &rv, &var_hash); + if (!skip) { - php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); ++ php_set_session_var(name, &rv, &var_hash); + } } else { - var_push_dtor_no_addref(&var_hash, ¤t); - efree(name); - PHP_VAR_UNSERIALIZE_DESTROY(var_hash); - return FAILURE; + zend_string_release(name); + retval = FAILURE; + goto break_outer_loop; + } + } else { - PS_ADD_VARL(name); ++ if(!skip) { ++ PS_ADD_VARL(name); + } - var_push_dtor_no_addref(&var_hash, ¤t); - } - if (!skip) { - PS_ADD_VARL(name, namelen); } skip: - efree(name); + zend_string_release(name); p = q; } diff --cc ext/standard/base64.c index d625dc0,b30a5b7..f6dbdf5 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@@ -57,10 -57,23 +57,10 @@@ PHPAPI zend_string *php_base64_encode(c { const unsigned char *current = str; unsigned char *p; - unsigned char *result; + zend_string *result; - result = zend_string_alloc(((length + 2) / 3) * 4 * sizeof(char), 0); - if (length < 0) { - if (ret_length != NULL) { - *ret_length = 0; - } - return NULL; - } - - if (((size_t)length + 2) / 3 > INT_MAX/4 ) { - TSRMLS_FETCH(); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "String too long, maximum is %d", INT_MAX/4); - return NULL; - } - - result = (unsigned char *) safe_emalloc((length + 2) / 3, 4 * sizeof(char), 1); - p = result; ++ result = zend_string_safe_alloc(((length + 2) / 3), 4 * sizeof(char), 0, 0); + p = (unsigned char *)ZSTR_VAL(result); while (length > 2) { /* keep going until we have less than 24 bits */ *p++ = base64_table[current[0] >> 2]; diff --cc ext/standard/quot_print.c index a55b1e5,6d5835e..be352cb --- a/ext/standard/quot_print.c +++ b/ext/standard/quot_print.c @@@ -275,8 -274,13 +275,8 @@@ PHP_FUNCTION(quoted_printable_encode RETURN_EMPTY_STRING(); } - new_str = php_quot_print_encode((unsigned char *)ZSTR_VAL(str), (size_t)ZSTR_LEN(str)); - new_str = (char *)php_quot_print_encode((unsigned char *)str, (size_t)str_len, &new_str_len); - if (new_str_len > INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "String too long, max length is %d", INT_MAX); - efree(new_str); - RETURN_FALSE; - } - RETURN_STRINGL(new_str, new_str_len, 0); ++ new_str = php_quot_print_encode((unsigned char *)ZSTR_VAL(str), ZSTR_LEN(str)); + RETURN_STR(new_str); } /* }}} */ diff --cc ext/standard/uuencode.c index e443337,a31f14d..787569e --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@@ -65,15 -65,13 +65,17 @@@ #define PHP_UU_DEC(c) (((c) - ' ') & 077) -PHPAPI int php_uuencode(char *src, int src_len, char **dest) /* {{{ */ +PHPAPI zend_string *php_uuencode(char *src, size_t src_len) /* {{{ */ { - int len = 45; + size_t len = 45; char *p, *s, *e, *ee; + zend_string *dest; -- /* encoded length is ~ 38% greater than the original */ - dest = zend_string_alloc((size_t)ceil(src_len * 1.38) + 46, 0); - p = *dest = safe_emalloc((size_t) ceil(src_len * 1.38), 1, 46); ++ /* encoded length is ~ 38% greater than the original ++ Use 1.5 for easier calculation. ++ */ ++ dest = zend_string_safe_alloc(src_len/2, 3, 46, 0); + p = ZSTR_VAL(dest); s = src; e = src + src_len; diff --cc ext/standard/var_unserializer.c index 3fc074d,c8e6f8a..f464c0b --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -800,7 -780,7 +801,7 @@@ yy20 return object_common2(UNSERIALIZE_PASSTHRU, elements); } - #line 804 "ext/standard/var_unserializer.c" -#line 784 "ext/standard/var_unserializer.c" ++#line 805 "ext/standard/var_unserializer.c" yy25: yych = *++YYCURSOR; if (yych <= ',') { @@@ -832,7 -812,9 +833,7 @@@ yy27 return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } - #line 836 "ext/standard/var_unserializer.c" -#line 818 "ext/standard/var_unserializer.c" ++#line 837 "ext/standard/var_unserializer.c" yy32: yych = *++YYCURSOR; if (yych == '+') goto yy33; @@@ -877,7 -856,7 +878,7 @@@ yy34 return finish_nested_data(UNSERIALIZE_PASSTHRU); } - #line 881 "ext/standard/var_unserializer.c" -#line 860 "ext/standard/var_unserializer.c" ++#line 882 "ext/standard/var_unserializer.c" yy39: yych = *++YYCURSOR; if (yych == '+') goto yy40; @@@ -929,10 -908,11 +930,10 @@@ yy41 YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 0); + ZVAL_STR(rval, str); return 1; } - #line 936 "ext/standard/var_unserializer.c" -#line 916 "ext/standard/var_unserializer.c" ++#line 937 "ext/standard/var_unserializer.c" yy46: yych = *++YYCURSOR; if (yych == '+') goto yy47; @@@ -982,10 -962,11 +983,10 @@@ yy48 YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 1); + ZVAL_STRINGL(rval, str, len); return 1; } - #line 989 "ext/standard/var_unserializer.c" -#line 970 "ext/standard/var_unserializer.c" ++#line 990 "ext/standard/var_unserializer.c" yy53: yych = *++YYCURSOR; if (yych <= '/') { @@@ -1079,10 -1060,11 +1080,10 @@@ yy63 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 1086 "ext/standard/var_unserializer.c" -#line 1068 "ext/standard/var_unserializer.c" ++#line 1087 "ext/standard/var_unserializer.c" yy65: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1157,7 -1138,7 +1158,7 @@@ yy73 return 1; } - #line 1161 "ext/standard/var_unserializer.c" -#line 1142 "ext/standard/var_unserializer.c" ++#line 1162 "ext/standard/var_unserializer.c" yy76: yych = *++YYCURSOR; if (yych == 'N') goto yy73; @@@ -1207,10 -1188,11 +1208,10 @@@ yy79 } #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_LONG(*rval, parse_iv(start + 2)); + ZVAL_LONG(rval, parse_iv(start + 2)); return 1; } - #line 1214 "ext/standard/var_unserializer.c" -#line 1196 "ext/standard/var_unserializer.c" ++#line 1215 "ext/standard/var_unserializer.c" yy83: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@@ -1218,22 -1200,24 +1219,22 @@@ yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; -#line 550 "ext/standard/var_unserializer.re" +#line 579 "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 1228 "ext/standard/var_unserializer.c" -#line 1211 "ext/standard/var_unserializer.c" ++#line 1229 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; -#line 543 "ext/standard/var_unserializer.re" +#line 573 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_NULL(*rval); + ZVAL_NULL(rval); return 1; } - #line 1237 "ext/standard/var_unserializer.c" -#line 1221 "ext/standard/var_unserializer.c" ++#line 1238 "ext/standard/var_unserializer.c" yy89: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1281,7 -1263,7 +1282,7 @@@ yy91 return 1; } - #line 1285 "ext/standard/var_unserializer.c" -#line 1267 "ext/standard/var_unserializer.c" ++#line 1286 "ext/standard/var_unserializer.c" yy95: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1330,9 -1304,12 +1331,9 @@@ yy97 return 1; } - #line 1334 "ext/standard/var_unserializer.c" -#line 1311 "ext/standard/var_unserializer.c" ++#line 1335 "ext/standard/var_unserializer.c" } -#line 862 "ext/standard/var_unserializer.re" +#line 886 "ext/standard/var_unserializer.re" return 0; diff --cc ext/wddx/wddx.c index a11efe6,d7bd295..08f9c4f --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@@ -921,7 -988,7 +921,7 @@@ static void php_wddx_pop_element(void * wddx_stack_top(stack, (void**)&ent2); /* if non-existent field */ - if (ent2->type == ST_FIELD && Z_ISUNDEF(ent2->data)) { - if (ent2->data == NULL) { ++ if (Z_ISUNDEF(ent2->data)) { zval_ptr_dtor(&ent1->data); efree(ent1); return; @@@ -1050,12 -1140,13 +1050,11 @@@ static void php_wddx_process_data(void } tmp[len] = '\0'; - Z_LVAL_P(ent->data) = php_parse_date(tmp, NULL); + ZVAL_LONG(&ent->data, php_parse_date(tmp, NULL)); /* date out of range < 1969 or > 2038 */ - if (Z_LVAL_P(ent->data) == -1) { - ZVAL_STRINGL(ent->data, tmp, len, 0); - } else { - efree(tmp); + if (Z_LVAL(ent->data) == -1) { + ZVAL_STRINGL(&ent->data, (char *)tmp, len); } - efree(tmp); } break; @@@ -1089,8 -1179,13 +1088,12 @@@ int php_wddx_deserialize_ex(const char if (stack.top == 1) { wddx_stack_top(&stack, (void**)&ent); - ZVAL_COPY(return_value, &ent->data); - retval = SUCCESS; - if(ent->data == NULL) { ++ if (IS_UNDEF(ent->data)) { + retval = FAILURE; + } else { - *return_value = *(ent->data); - zval_copy_ctor(return_value); ++ ZVAL_COPY(return_value, &ent->data); + retval = SUCCESS; + } } else { retval = FAILURE; }
diff --cc ext/exif/exif.c index 2594cad,657a2cc..f0c631e --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@@ -3760,9 -3771,8 +3760,8 @@@ static int exif_process_IFD_in_TIFF(ima efree(ImageInfo->Thumbnail.data); ImageInfo->Thumbnail.data = NULL; } else { - exif_thumbnail_build(ImageInfo TSRMLS_CC); + exif_thumbnail_build(ImageInfo); } - exif_thumbnail_build(ImageInfo); } #ifdef EXIF_DEBUG exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Read next IFD (THUMBNAIL) done"); diff --cc ext/session/session.c index 380cad5,b2d0236..48cd0f1 --- a/ext/session/session.c +++ b/ext/session/session.c @@@ -958,16 -918,19 +958,18 @@@ PS_SERIALIZER_ENCODE_FUNC(php_binary) / PS_SERIALIZER_DECODE_FUNC(php_binary) /* {{{ */ { const char *p; - char *name; const char *endptr = val + vallen; - zval *current; - int namelen; int has_value; + int namelen; + zend_string *name; php_unserialize_data_t var_hash; + int skip = 0; PHP_VAR_UNSERIALIZE_INIT(var_hash); for (p = val; p < endptr; ) { - zval **tmp; + zval *tmp; + skip = 0; namelen = ((unsigned char)(*p)) & (~PS_BIN_UNDEF); if (namelen < 0 || namelen > PS_BIN_MAX || (p + namelen) >= endptr) { @@@ -981,23 -944,19 +983,24 @@@ p += namelen + 1; - if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void **) &tmp) == SUCCESS) { - if ((Z_TYPE_PP(tmp) == IS_ARRAY && Z_ARRVAL_PP(tmp) == &EG(symbol_table)) || *tmp == PS(http_session_vars)) { + if ((tmp = zend_hash_find(&EG(symbol_table), name))) { + if ((Z_TYPE_P(tmp) == IS_ARRAY && + Z_ARRVAL_P(tmp) == &EG(symbol_table)) || tmp == &PS(http_session_vars)) { - zend_string_release(name); - continue; + skip = 1; } } if (has_value) { - ALLOC_INIT_ZVAL(current); - if (php_var_unserialize(¤t, (const unsigned char **) &p, (const unsigned char *) endptr, &var_hash TSRMLS_CC)) { + zval *current, rv; + current = var_tmp_var(&var_hash); + if (php_var_unserialize(current, (const unsigned char **) &p, (const unsigned char *) endptr, &var_hash)) { + ZVAL_PTR(&rv, current); - php_set_session_var(name, &rv, &var_hash ); + if (!skip) { - php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); ++ php_set_session_var(name, &rv, &var_hash); + } } else { + zend_string_release(name); + php_session_normalize_vars(); PHP_VAR_UNSERIALIZE_DESTROY(var_hash); return FAILURE; } @@@ -1051,19 -1015,22 +1054,21 @@@ PS_SERIALIZER_ENCODE_FUNC(php) /* {{{ * PS_SERIALIZER_DECODE_FUNC(php) /* {{{ */ { const char *p, *q; - char *name; const char *endptr = val + vallen; - zval *current; - int namelen; - int has_value; + ptrdiff_t namelen; + zend_string *name; + int has_value, retval = SUCCESS; php_unserialize_data_t var_hash; + int skip = 0; PHP_VAR_UNSERIALIZE_INIT(var_hash); p = val; while (p < endptr) { - zval **tmp; + zval *tmp; q = p; + skip = 0; while (*q != PS_DELIMITER) { if (++q >= endptr) goto break_outer_loop; } @@@ -1075,32 -1042,34 +1080,36 @@@ } namelen = q - p; - name = estrndup(p, namelen); + name = zend_string_init(p, namelen, 0); q++; - if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void **) &tmp) == SUCCESS) { - if ((Z_TYPE_PP(tmp) == IS_ARRAY && Z_ARRVAL_PP(tmp) == &EG(symbol_table)) || *tmp == PS(http_session_vars)) { + if ((tmp = zend_hash_find(&EG(symbol_table), name))) { + if ((Z_TYPE_P(tmp) == IS_ARRAY && + Z_ARRVAL_P(tmp) == &EG(symbol_table)) || tmp == &PS(http_session_vars)) { - goto skip; + skip = 1; } } if (has_value) { - ALLOC_INIT_ZVAL(current); - if (php_var_unserialize(¤t, (const unsigned char **) &q, (const unsigned char *) endptr, &var_hash TSRMLS_CC)) { + zval *current, rv; + current = var_tmp_var(&var_hash); + if (php_var_unserialize(current, (const unsigned char **)&q, (const unsigned char *)endptr, &var_hash)) { + ZVAL_PTR(&rv, current); - php_set_session_var(name, &rv, &var_hash); + if (!skip) { - php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); ++ php_set_session_var(name, &rv, &var_hash); + } } else { - var_push_dtor_no_addref(&var_hash, ¤t); - efree(name); - PHP_VAR_UNSERIALIZE_DESTROY(var_hash); - return FAILURE; + zend_string_release(name); + retval = FAILURE; + goto break_outer_loop; + } + } else { - PS_ADD_VARL(name); ++ if(!skip) { ++ PS_ADD_VARL(name); + } - var_push_dtor_no_addref(&var_hash, ¤t); - } - if (!skip) { - PS_ADD_VARL(name, namelen); } skip: - efree(name); + zend_string_release(name); p = q; } diff --cc ext/standard/base64.c index d625dc0,b30a5b7..f6dbdf5 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@@ -57,10 -57,23 +57,10 @@@ PHPAPI zend_string *php_base64_encode(c { const unsigned char *current = str; unsigned char *p; - unsigned char *result; + zend_string *result; - result = zend_string_alloc(((length + 2) / 3) * 4 * sizeof(char), 0); - if (length < 0) { - if (ret_length != NULL) { - *ret_length = 0; - } - return NULL; - } - - if (((size_t)length + 2) / 3 > INT_MAX/4 ) { - TSRMLS_FETCH(); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "String too long, maximum is %d", INT_MAX/4); - return NULL; - } - - result = (unsigned char *) safe_emalloc((length + 2) / 3, 4 * sizeof(char), 1); - p = result; ++ result = zend_string_safe_alloc(((length + 2) / 3), 4 * sizeof(char), 0, 0); + p = (unsigned char *)ZSTR_VAL(result); while (length > 2) { /* keep going until we have less than 24 bits */ *p++ = base64_table[current[0] >> 2]; diff --cc ext/standard/quot_print.c index a55b1e5,6d5835e..be352cb --- a/ext/standard/quot_print.c +++ b/ext/standard/quot_print.c @@@ -275,8 -274,13 +275,8 @@@ PHP_FUNCTION(quoted_printable_encode RETURN_EMPTY_STRING(); } - new_str = php_quot_print_encode((unsigned char *)ZSTR_VAL(str), (size_t)ZSTR_LEN(str)); - new_str = (char *)php_quot_print_encode((unsigned char *)str, (size_t)str_len, &new_str_len); - if (new_str_len > INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "String too long, max length is %d", INT_MAX); - efree(new_str); - RETURN_FALSE; - } - RETURN_STRINGL(new_str, new_str_len, 0); ++ new_str = php_quot_print_encode((unsigned char *)ZSTR_VAL(str), ZSTR_LEN(str)); + RETURN_STR(new_str); } /* }}} */ diff --cc ext/standard/uuencode.c index e443337,a31f14d..787569e --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@@ -65,15 -65,13 +65,17 @@@ #define PHP_UU_DEC(c) (((c) - ' ') & 077) -PHPAPI int php_uuencode(char *src, int src_len, char **dest) /* {{{ */ +PHPAPI zend_string *php_uuencode(char *src, size_t src_len) /* {{{ */ { - int len = 45; + size_t len = 45; char *p, *s, *e, *ee; + zend_string *dest; -- /* encoded length is ~ 38% greater than the original */ - dest = zend_string_alloc((size_t)ceil(src_len * 1.38) + 46, 0); - p = *dest = safe_emalloc((size_t) ceil(src_len * 1.38), 1, 46); ++ /* encoded length is ~ 38% greater than the original ++ Use 1.5 for easier calculation. ++ */ ++ dest = zend_string_safe_alloc(src_len/2, 3, 46, 0); + p = ZSTR_VAL(dest); s = src; e = src + src_len; diff --cc ext/standard/var_unserializer.c index 3fc074d,c8e6f8a..f464c0b --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -800,7 -780,7 +801,7 @@@ yy20 return object_common2(UNSERIALIZE_PASSTHRU, elements); } - #line 804 "ext/standard/var_unserializer.c" -#line 784 "ext/standard/var_unserializer.c" ++#line 805 "ext/standard/var_unserializer.c" yy25: yych = *++YYCURSOR; if (yych <= ',') { @@@ -832,7 -812,9 +833,7 @@@ yy27 return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } - #line 836 "ext/standard/var_unserializer.c" -#line 818 "ext/standard/var_unserializer.c" ++#line 837 "ext/standard/var_unserializer.c" yy32: yych = *++YYCURSOR; if (yych == '+') goto yy33; @@@ -877,7 -856,7 +878,7 @@@ yy34 return finish_nested_data(UNSERIALIZE_PASSTHRU); } - #line 881 "ext/standard/var_unserializer.c" -#line 860 "ext/standard/var_unserializer.c" ++#line 882 "ext/standard/var_unserializer.c" yy39: yych = *++YYCURSOR; if (yych == '+') goto yy40; @@@ -929,10 -908,11 +930,10 @@@ yy41 YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 0); + ZVAL_STR(rval, str); return 1; } - #line 936 "ext/standard/var_unserializer.c" -#line 916 "ext/standard/var_unserializer.c" ++#line 937 "ext/standard/var_unserializer.c" yy46: yych = *++YYCURSOR; if (yych == '+') goto yy47; @@@ -982,10 -962,11 +983,10 @@@ yy48 YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 1); + ZVAL_STRINGL(rval, str, len); return 1; } - #line 989 "ext/standard/var_unserializer.c" -#line 970 "ext/standard/var_unserializer.c" ++#line 990 "ext/standard/var_unserializer.c" yy53: yych = *++YYCURSOR; if (yych <= '/') { @@@ -1079,10 -1060,11 +1080,10 @@@ yy63 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 1086 "ext/standard/var_unserializer.c" -#line 1068 "ext/standard/var_unserializer.c" ++#line 1087 "ext/standard/var_unserializer.c" yy65: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1157,7 -1138,7 +1158,7 @@@ yy73 return 1; } - #line 1161 "ext/standard/var_unserializer.c" -#line 1142 "ext/standard/var_unserializer.c" ++#line 1162 "ext/standard/var_unserializer.c" yy76: yych = *++YYCURSOR; if (yych == 'N') goto yy73; @@@ -1207,10 -1188,11 +1208,10 @@@ yy79 } #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_LONG(*rval, parse_iv(start + 2)); + ZVAL_LONG(rval, parse_iv(start + 2)); return 1; } - #line 1214 "ext/standard/var_unserializer.c" -#line 1196 "ext/standard/var_unserializer.c" ++#line 1215 "ext/standard/var_unserializer.c" yy83: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@@ -1218,22 -1200,24 +1219,22 @@@ yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; -#line 550 "ext/standard/var_unserializer.re" +#line 579 "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 1228 "ext/standard/var_unserializer.c" -#line 1211 "ext/standard/var_unserializer.c" ++#line 1229 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; -#line 543 "ext/standard/var_unserializer.re" +#line 573 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_NULL(*rval); + ZVAL_NULL(rval); return 1; } - #line 1237 "ext/standard/var_unserializer.c" -#line 1221 "ext/standard/var_unserializer.c" ++#line 1238 "ext/standard/var_unserializer.c" yy89: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1281,7 -1263,7 +1282,7 @@@ yy91 return 1; } - #line 1285 "ext/standard/var_unserializer.c" -#line 1267 "ext/standard/var_unserializer.c" ++#line 1286 "ext/standard/var_unserializer.c" yy95: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1330,9 -1304,12 +1331,9 @@@ yy97 return 1; } - #line 1334 "ext/standard/var_unserializer.c" -#line 1311 "ext/standard/var_unserializer.c" ++#line 1335 "ext/standard/var_unserializer.c" } -#line 862 "ext/standard/var_unserializer.re" +#line 886 "ext/standard/var_unserializer.re" return 0; diff --cc ext/wddx/wddx.c index a11efe6,d7bd295..08f9c4f --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@@ -921,7 -988,7 +921,7 @@@ static void php_wddx_pop_element(void * wddx_stack_top(stack, (void**)&ent2); /* if non-existent field */ - if (ent2->type == ST_FIELD && Z_ISUNDEF(ent2->data)) { - if (ent2->data == NULL) { ++ if (Z_ISUNDEF(ent2->data)) { zval_ptr_dtor(&ent1->data); efree(ent1); return; @@@ -1050,12 -1140,13 +1050,11 @@@ static void php_wddx_process_data(void } tmp[len] = '\0'; - Z_LVAL_P(ent->data) = php_parse_date(tmp, NULL); + ZVAL_LONG(&ent->data, php_parse_date(tmp, NULL)); /* date out of range < 1969 or > 2038 */ - if (Z_LVAL_P(ent->data) == -1) { - ZVAL_STRINGL(ent->data, tmp, len, 0); - } else { - efree(tmp); + if (Z_LVAL(ent->data) == -1) { + ZVAL_STRINGL(&ent->data, (char *)tmp, len); } - efree(tmp); } break; @@@ -1089,8 -1179,13 +1088,12 @@@ int php_wddx_deserialize_ex(const char if (stack.top == 1) { wddx_stack_top(&stack, (void**)&ent); - ZVAL_COPY(return_value, &ent->data); - retval = SUCCESS; - if(ent->data == NULL) { ++ if (IS_UNDEF(ent->data)) { + retval = FAILURE; + } else { - *return_value = *(ent->data); - zval_copy_ctor(return_value); ++ ZVAL_COPY(return_value, &ent->data); + retval = SUCCESS; + } } else { retval = FAILURE; }