Don't allocate memory for empty HashTables.

diff --git a/ext/standard/array.c b/ext/standard/array.c
index b1ee800bc27f783e5732cd78a61b3e36389c212e..59e957d3cd7dc4a5227eaeefa39eb1c7fc86a13c 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3308,6 +3308,9 @@ PHP_FUNCTION(array_keys)
                }
        } else {
                array_init_size(return_value, zend_hash_num_elements(Z_ARRVAL_P(input)));
+               if (!zend_hash_num_elements(Z_ARRVAL_P(input))) {
+                       return;
+               }
                zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
                ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
                        /* Go through input array and add keys to the return array */
@@ -3343,6 +3346,11 @@ PHP_FUNCTION(array_values)
 
        /* Initialize return array */
        array_init_size(return_value, zend_hash_num_elements(Z_ARRVAL_P(input)));
+
+       if (!zend_hash_num_elements(Z_ARRVAL_P(input))) {
+               return;
+       }
+
        zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
 
        /* Go through input array and add values to the return array */

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 43e82d2ded2565d6ba373c2a5c1e02784ad2bbd0..c48bad132f9a023d359d39e13496d484c0a44ab9 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.7.5 */
+/* Generated by re2c 0.13.5 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -599,7 +599,7 @@ yy2:
        yych = *(YYMARKER = ++YYCURSOR);
        if (yych == ':') goto yy95;
 yy3:
-#line 893 "ext/standard/var_unserializer.re"
+#line 895 "ext/standard/var_unserializer.re"
        { return 0; }
 #line 605 "ext/standard/var_unserializer.c"
 yy4:
@@ -644,7 +644,7 @@ yy13:
        goto yy3;
 yy14:
        ++YYCURSOR;
-#line 887 "ext/standard/var_unserializer.re"
+#line 889 "ext/standard/var_unserializer.re"
        {
        /* this is the case where we have less data than planned */
        php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
@@ -676,12 +676,11 @@ yy20:
        if (yybm[0+yych] & 128) {
                goto yy20;
        }
-       if (yych <= '/') goto yy18;
-       if (yych >= ';') goto yy18;
+       if (yych != ':') goto yy18;
        yych = *++YYCURSOR;
        if (yych != '"') goto yy18;
        ++YYCURSOR;
-#line 741 "ext/standard/var_unserializer.re"
+#line 743 "ext/standard/var_unserializer.re"
        {
        size_t len, len2, len3, maxlen;
        zend_long elements;
@@ -827,7 +826,7 @@ yy20:
 
        return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 831 "ext/standard/var_unserializer.c"
+#line 830 "ext/standard/var_unserializer.c"
 yy25:
        yych = *++YYCURSOR;
        if (yych <= ',') {
@@ -852,7 +851,7 @@ yy27:
        yych = *++YYCURSOR;
        if (yych != '"') goto yy18;
        ++YYCURSOR;
-#line 732 "ext/standard/var_unserializer.re"
+#line 734 "ext/standard/var_unserializer.re"
        {
     if (!var_hash) return 0;
 
@@ -861,7 +860,7 @@ yy27:
        return object_common2(UNSERIALIZE_PASSTHRU,
                        object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 865 "ext/standard/var_unserializer.c"
+#line 864 "ext/standard/var_unserializer.c"
 yy32:
        yych = *++YYCURSOR;
        if (yych == '+') goto yy33;
@@ -896,7 +895,9 @@ yy34:
        array_init_size(rval, elements);
 //??? we can't convert from packed to hash during unserialization, because
 //??? reference to some zvals might be keept in var_hash (to support references)
-       zend_hash_real_init(Z_ARRVAL_P(rval), 0);
+       if (elements) {
+               zend_hash_real_init(Z_ARRVAL_P(rval), 0);
+       }
 
        if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_P(rval), elements, 0)) {
                return 0;
@@ -904,7 +905,7 @@ yy34:
 
        return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 908 "ext/standard/var_unserializer.c"
+#line 909 "ext/standard/var_unserializer.c"
 yy39:
        yych = *++YYCURSOR;
        if (yych == '+') goto yy40;
@@ -953,7 +954,7 @@ yy41:
        ZVAL_STR(rval, str);
        return 1;
 }
-#line 957 "ext/standard/var_unserializer.c"
+#line 958 "ext/standard/var_unserializer.c"
 yy46:
        yych = *++YYCURSOR;
        if (yych == '+') goto yy47;
@@ -1001,7 +1002,7 @@ yy48:
        ZVAL_STRINGL(rval, str, len);
        return 1;
 }
-#line 1005 "ext/standard/var_unserializer.c"
+#line 1006 "ext/standard/var_unserializer.c"
 yy53:
        yych = *++YYCURSOR;
        if (yych <= '/') {
@@ -1098,7 +1099,7 @@ use_double:
        ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
        return 1;
 }
-#line 1102 "ext/standard/var_unserializer.c"
+#line 1103 "ext/standard/var_unserializer.c"
 yy65:
        yych = *++YYCURSOR;
        if (yych <= ',') {
@@ -1173,7 +1174,7 @@ yy73:
 
        return 1;
 }
-#line 1177 "ext/standard/var_unserializer.c"
+#line 1178 "ext/standard/var_unserializer.c"
 yy76:
        yych = *++YYCURSOR;
        if (yych == 'N') goto yy73;
@@ -1226,7 +1227,7 @@ yy79:
        ZVAL_LONG(rval, parse_iv(start + 2));
        return 1;
 }
-#line 1230 "ext/standard/var_unserializer.c"
+#line 1231 "ext/standard/var_unserializer.c"
 yy83:
        yych = *++YYCURSOR;
        if (yych <= '/') goto yy18;
@@ -1240,7 +1241,7 @@ yy83:
        ZVAL_BOOL(rval, parse_iv(start + 2));
        return 1;
 }
-#line 1244 "ext/standard/var_unserializer.c"
+#line 1245 "ext/standard/var_unserializer.c"
 yy87:
        ++YYCURSOR;
 #line 592 "ext/standard/var_unserializer.re"
@@ -1249,7 +1250,7 @@ yy87:
        ZVAL_NULL(rval);
        return 1;
 }
-#line 1253 "ext/standard/var_unserializer.c"
+#line 1254 "ext/standard/var_unserializer.c"
 yy89:
        yych = *++YYCURSOR;
        if (yych <= ',') {
@@ -1295,7 +1296,7 @@ yy91:
 
        return 1;
 }
-#line 1299 "ext/standard/var_unserializer.c"
+#line 1300 "ext/standard/var_unserializer.c"
 yy95:
        yych = *++YYCURSOR;
        if (yych <= ',') {
@@ -1340,9 +1341,9 @@ yy97:
 
        return 1;
 }
-#line 1344 "ext/standard/var_unserializer.c"
+#line 1345 "ext/standard/var_unserializer.c"
 }
-#line 895 "ext/standard/var_unserializer.re"
+#line 897 "ext/standard/var_unserializer.re"
 
 
        return 0;

diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 35c46c0f75a8b650be978c7f3f56da1bb60103d2..a1fe006f319935c2fe3eadb33d08b292fb304623 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -720,7 +720,9 @@ use_double:
        array_init_size(rval, elements);
 //??? we can't convert from packed to hash during unserialization, because
 //??? reference to some zvals might be keept in var_hash (to support references)
-       zend_hash_real_init(Z_ARRVAL_P(rval), 0);
+       if (elements) {
+               zend_hash_real_init(Z_ARRVAL_P(rval), 0);
+       }
 
        if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_P(rval), elements, 0)) {
                return 0;