]> granicus.if.org Git - php/commitdiff
Avoid rehashing of "packed" array
authorDmitry Stogov <dmitry@zend.com>
Wed, 30 May 2018 17:17:25 +0000 (20:17 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 30 May 2018 17:17:25 +0000 (20:17 +0300)
ext/standard/array.c

index 363abfc771f8a407ddf73db0426238d16812f2c5..f7089579715439c0e12f53d72227f630b15db439 100644 (file)
@@ -5753,7 +5753,7 @@ PHP_FUNCTION(array_multisort)
                hash->nNextFreeElement = array_size;
                if (repack) {
                        zend_hash_to_packed(hash);
-               } else {
+               } else if (!(HT_FLAGS(hash) & HASH_FLAG_PACKED)) {
                        zend_hash_rehash(hash);
                }
        }