archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

We could do more....

Browse source
This commit is contained in:
Xinchen Hui 2015-01-15 04:29:01 -05:00
parent 2823c9dafb
commit 11f615b311
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/standard/array.c
View file

@ -3229,6 +3229,9 @@ PHP_FUNCTION(array_unique)
for (idx = 0; idx < i; idx++) { for (idx = 0; idx < i; idx++) {
cmpdata = &arTmp[idx]; cmpdata = &arTmp[idx];
if (Z_TYPE(cmpdata->b.val) != IS_UNDEF) { if (Z_TYPE(cmpdata->b.val) != IS_UNDEF) {
#if 1
continue;
#else
if (lastkept == NULL) { if (lastkept == NULL) {
lastkept = cmpdata; lastkept = cmpdata;
continue; continue;
@ -3244,13 +3247,14 @@ PHP_FUNCTION(array_unique)
p = &cmpdata->b; p = &cmpdata->b;
} }
} }
#endif
} else { } else {
p = &cmpdata->b; p = &cmpdata->b;
} }
if (p->key == NULL) { if (p->key == NULL) {
zend_hash_index_del(Z_ARRVAL_P(return_value), p->h); zend_hash_index_del(Z_ARRVAL_P(return_value), p->h);
} else { } else {
zend_hash_del(Z_ARRVAL_P(return_value), p->key); zend_hash_del(Z_ARRVAL_P(return_value), p->key);
} }
} }
pefree(arTmp, Z_ARRVAL_P(array)->u.flags & HASH_FLAG_PERSISTENT); pefree(arTmp, Z_ARRVAL_P(array)->u.flags & HASH_FLAG_PERSISTENT);