Fix zend_llist_apply_with_del - it should remove from list,

not only call dtor

diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index e0798f1a91aead068d94a095f82e349fa9cf29f3..4d78b6c0b6817f5235814880df58443b034aa30f 100644 (file)
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -63,26 +63,30 @@ ZEND_API void zend_llist_prepend_element(zend_llist *l, void *element)
 }
 
 
+#define DEL_LLIST_ELEMENT(current,l) \
+                       if (current->prev) {\
+                               current->prev->next = current->next;\
+                       } else {\
+                               l->head = current->next;\
+                       }\
+                       if (current->next) {\
+                               current->next->prev = current->prev;\
+                       } else {\
+                               l->tail = current->prev;\
+                       }\
+                       if (l->dtor) {\
+                               l->dtor(current->data);\
+                               pefree(current, l->persistent);\
+                       }
+
+
 ZEND_API void zend_llist_del_element(zend_llist *l, void *element, int (*compare)(void *element1, void *element2))
 {
        zend_llist_element *current=l->head;
 
        while (current) {
                if (compare(current->data, element)) {
-                       if (current->prev) {
-                               current->prev->next = current->next;
-                       } else {
-                               l->head = current->next;
-                       }
-                       if (current->next) {
-                               current->next->prev = current->prev;
-                       } else {
-                               l->tail = current->prev;
-                       }
-                       if (l->dtor) {
-                               l->dtor(current->data);
-                               pefree(current, l->persistent);
-                       }
+                       DEL_LLIST_ELEMENT(current,l);
                        break;
                }
                current = current->next;
@@ -147,10 +151,7 @@ ZEND_API void zend_llist_apply_with_del(zend_llist *l, int (*func)(void *data))
        while (element) {
                next = element->next;
                if (func(element->data)) {
-                       if (l->dtor) {
-                               l->dtor(element->data);
-                               pefree(element, l->persistent);
-                       }
+                       DEL_LLIST_ELEMENT(element,l);
                }
                element = next;
        }