Patch bug50816.patch for Scripting Engine problem Bug #50816

Patch version 2011-07-30 15:24 UTC

Obsoleted by patches:

• bug50816.patch, revision 2011-07-30 16:06 UTC

Developer: laruence@php.net

Line 1 (now 1), was 30 lines, now 29 lines

  Index: Zend/zend_hash.c
  ===================================================================
  --- Zend/zend_hash.c	(revision 313966)
  +++ Zend/zend_hash.c	(working copy)
 @@ -1187,14 +1187,26 @@
 @@ -1187,14 +1187,25 @@
   			}
   
   			if (mode != HASH_UPDATE_KEY_ANYWAY) {
  -				Bucket *q = ht->arBuckets[num_index & ht->nTableMask];
  -				int found = 0;
  +				Bucket *q, *t;
  +				int before = 0;
   
 +				q = ht->arBuckets[num_index & ht->nTableMask];
  +				t = ht->pListHead;
  +				while (t) {
 +					if (!t->nKeyLength && t->h == num_index) {
 +					if (t == q) {
  +						before = 1;
  +						break;
  +					}
 +					if (t == p) {
 +						break;
 +					}
 +					t = t->pListNext;
 +				}
 +
 +				q = ht->arBuckets[num_index & ht->nTableMask];
 +					if (t == p) {
 +						break;
 +					}
 +					t = t->pListNext;
 +				}
  +
   				while (q != NULL) {
  -					if (q == p) {
  -						found = 1;


  +						if (before) {
   							if (mode & HASH_UPDATE_KEY_IF_BEFORE) {
   								break;
   							} else {
 @@ -1230,16 +1242,29 @@
 @@ -1230,16 +1241,27 @@
   			}
   
   			if (mode != HASH_UPDATE_KEY_ANYWAY) {
  +				Bucket *q, *t;
Line 44 (now 43), was 22 lines, now 20 lines

   				ulong h = zend_inline_hash_func(str_index, str_length);
  -				Bucket *q = ht->arBuckets[h & ht->nTableMask];
  -				int found = 0;
   
 +				q = ht->arBuckets[h & ht->nTableMask];
  +				t = ht->pListHead;
  +				while (t) {
 +					if (t->h == h && t->nKeyLength == str_length &&
 +							memcmp(t->arKey, str_index, str_length) == 0) {
 +					if (t == q) {
  +						before = 1;
 +						break;
 +					}
 +						break;
 +					}
  +					if (t == p) {
  +						break;
  +					}
  +					t = t->pListNext;
  +				}
 +
 +				q = ht->arBuckets[h & ht->nTableMask];
  +
   				while (q != NULL) {
  -					if (q == p) {
  -						found = 1;