summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-05-30 20:17:25 +0300
committerDmitry Stogov <dmitry@zend.com>2018-05-30 20:17:25 +0300
commit3c122e16055adba4ccd0c79aabce0bba85fe8078 (patch)
tree3dbc95ddeb7539e5c9a4ea8700726d87e71187bc
parent655d249ac98b8f8d377526535da43b71c8136437 (diff)
downloadphp-git-3c122e16055adba4ccd0c79aabce0bba85fe8078.tar.gz
Avoid rehashing of "packed" array
-rw-r--r--ext/standard/array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 363abfc771..f708957971 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -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);
}
}