summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierrick Charron <pierrick@php.net>2012-12-26 10:17:37 -0500
committerPierrick Charron <pierrick@php.net>2012-12-26 10:17:37 -0500
commit663434cd764b6030a4d9e6b565e0fff9eaa6a66c (patch)
tree7446ba290c6d716d24adb8af8df68c7b9a0d9907
parentc12ab5c306172fba153ba228586d0a6f2a470f2b (diff)
parentb35ffdeae10eb1b71470eb831c02b3b7b838945d (diff)
downloadphp-git-663434cd764b6030a4d9e6b565e0fff9eaa6a66c.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
-rw-r--r--Zend/zend_llist.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index 26baf4d958..4656420781 100644
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -91,13 +91,15 @@ ZEND_API void zend_llist_prepend_element(zend_llist *l, void *element)
ZEND_API void zend_llist_del_element(zend_llist *l, void *element, int (*compare)(void *element1, void *element2))
{
zend_llist_element *current=l->head;
+ zend_llist_element *next;
while (current) {
+ next = current->next;
if (compare(current->data, element)) {
DEL_LLIST_ELEMENT(current, l);
break;
}
- current = current->next;
+ current = next;
}
}