|
 |
2067da |
From df78c48354f376cf419d7a97f88ca07d572f00fb Mon Sep 17 00:00:00 2001
|
|
|
2067da |
From: Xinchen Hui <laruence@php.net>
|
|
|
2067da |
Date: Wed, 2 Jul 2014 17:45:09 +0800
|
|
|
2067da |
Subject: [PATCH] Fixed Bug #67538 (SPL Iterators use-after-free)
|
|
|
2067da |
|
|
|
2067da |
---
|
|
|
2067da |
NEWS | 3 +++
|
|
|
2067da |
ext/spl/spl_dllist.c | 7 +++++--
|
|
|
2067da |
ext/spl/tests/bug67538.phpt | 17 +++++++++++++++++
|
|
|
2067da |
3 files changed, 25 insertions(+), 2 deletions(-)
|
|
|
2067da |
create mode 100644 ext/spl/tests/bug67538.phpt
|
|
|
2067da |
|
|
|
2067da |
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
|
|
|
2067da |
index 39a0733..0b44d41 100644
|
|
|
2067da |
--- a/ext/spl/spl_dllist.c
|
|
|
2067da |
+++ b/ext/spl/spl_dllist.c
|
|
|
2067da |
@@ -43,12 +43,10 @@ PHPAPI zend_class_entry *spl_ce_SplStack;
|
|
|
2067da |
|
|
|
2067da |
#define SPL_LLIST_DELREF(elem) if(!--(elem)->rc) { \
|
|
|
2067da |
efree(elem); \
|
|
|
2067da |
- elem = NULL; \
|
|
|
2067da |
}
|
|
|
2067da |
|
|
|
2067da |
#define SPL_LLIST_CHECK_DELREF(elem) if((elem) && !--(elem)->rc) { \
|
|
|
2067da |
efree(elem); \
|
|
|
2067da |
- elem = NULL; \
|
|
|
2067da |
}
|
|
|
2067da |
|
|
|
2067da |
#define SPL_LLIST_ADDREF(elem) (elem)->rc++
|
|
|
2067da |
@@ -916,6 +914,11 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset)
|
|
|
2067da |
llist->dtor(element TSRMLS_CC);
|
|
|
2067da |
}
|
|
|
2067da |
|
|
|
2067da |
+ if (intern->traverse_pointer == element) {
|
|
|
2067da |
+ SPL_LLIST_DELREF(element);
|
|
|
2067da |
+ intern->traverse_pointer = NULL;
|
|
|
2067da |
+ }
|
|
|
2067da |
+
|
|
|
2067da |
zval_ptr_dtor((zval **)&element->data);
|
|
|
2067da |
element->data = NULL;
|
|
|
2067da |
|
|
|
2067da |
diff --git a/ext/spl/tests/bug67538.phpt b/ext/spl/tests/bug67538.phpt
|
|
|
2067da |
new file mode 100644
|
|
|
2067da |
index 0000000..b6f3848
|
|
|
2067da |
--- /dev/null
|
|
|
2067da |
+++ b/ext/spl/tests/bug67538.phpt
|
|
|
2067da |
@@ -0,0 +1,17 @@
|
|
|
2067da |
+--TEST--
|
|
|
2067da |
+Bug #67538 (SPL Iterators use-after-free)
|
|
|
2067da |
+--FILE--
|
|
|
2067da |
+
|
|
|
2067da |
+$list = new SplDoublyLinkedList();
|
|
|
2067da |
+$list->push('a');
|
|
|
2067da |
+$list->push('b');
|
|
|
2067da |
+
|
|
|
2067da |
+$list->rewind();
|
|
|
2067da |
+$list->offsetUnset(0);
|
|
|
2067da |
+$list->push('b');
|
|
|
2067da |
+$list->offsetUnset(0);
|
|
|
2067da |
+$list->next();
|
|
|
2067da |
+echo "okey";
|
|
|
2067da |
+?>
|
|
|
2067da |
+--EXPECTF--
|
|
|
2067da |
+okey
|
|
|
2067da |
--
|
|
|
2067da |
1.9.2
|
|
|
2067da |
|