com php-src: don't sort array with single element: ext/standard/array.c

From: Date: Fri, 19 Dec 2014 10:07:35 +0000
Subject: com php-src: don't sort array with single element: ext/standard/array.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83802@lists.php.net to get a copy of this message
Commit: f7b6518d10d4a0ee09b49957df6e048ec622fa25 Author: Dmitry Stogov <dmitry@zend.com> Fri, 19 Dec 2014 13:07:35 +0300 Parents: 441270db2c44c299467925d4c97ea5c5251ac474 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f7b6518d10d4a0ee09b49957df6e048ec622fa25 Log: don't sort array with single element Changed paths: M ext/standard/array.c Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index 041c685..b985b88 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -3420,10 +3420,12 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int *list++ = *p; } ZVAL_UNDEF(&list->val); - if (behavior == INTERSECT_NORMAL) { - zend_qsort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), intersect_data_compare_func); - } else if (behavior & INTERSECT_ASSOC) { /* triggered also when INTERSECT_KEY */ - zend_qsort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), intersect_key_compare_func); + if (hash->nNumOfElements > 1) { + if (behavior == INTERSECT_NORMAL) { + zend_qsort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), intersect_data_compare_func); + } else if (behavior & INTERSECT_ASSOC) { /* triggered also when INTERSECT_KEY */ + zend_qsort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), intersect_key_compare_func); + } } } @@ -3838,10 +3840,12 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_ *list++ = *p; } ZVAL_UNDEF(&list->val); - if (behavior == DIFF_NORMAL) { - zend_qsort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), diff_data_compare_func); - } else if (behavior & DIFF_ASSOC) { /* triggered also when DIFF_KEY */ - zend_qsort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), diff_key_compare_func); + if (hash->nNumOfElements > 1) { + if (behavior == DIFF_NORMAL) { + zend_qsort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), diff_data_compare_func); + } else if (behavior & DIFF_ASSOC) { /* triggered also when DIFF_KEY */ + zend_qsort((void *) lists[i], hash->nNumOfElements, sizeof(Bucket), diff_key_compare_func); + } } }

« previous php.cvs (#83802) next »