Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

* phpdbg/master: C89 compat
esr2587758 · Apr 27, 2014 · 3b6bf6e · 3b6bf6e
2 parents a10dc3a + 4aa80db
commit 3b6bf6e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
@@ -464,9 +464,9 @@ PHPDBG_WATCH(array) /* {{{ */
 
 void phpdbg_watch_HashTable_dtor(zval **zv) {
 	phpdbg_btree_result *result;
-	zval_ptr_dtor_wrapper(zv);
 	TSRMLS_FETCH();
 
+	zval_ptr_dtor_wrapper(zv);
 
 	if ((result = phpdbg_btree_find(&PHPDBG_G(watchpoint_tree), (zend_ulong)*zv))) {
 		phpdbg_watchpoint_t *watch = result->ptr;
@@ -772,9 +772,11 @@ void phpdbg_list_watchpoints(TSRMLS_D) {
 }
 
 void phpdbg_watch_efree(void *ptr) {
-	phpdbg_btree_result *result = phpdbg_btree_find_closest(&PHPDBG_G(watchpoint_tree), (zend_ulong)ptr);
+	phpdbg_btree_result *result;
 	TSRMLS_FETCH();
 
+	result = phpdbg_btree_find_closest(&PHPDBG_G(watchpoint_tree), (zend_ulong)ptr);
+
 	if (result) {
 		phpdbg_watchpoint_t *watch = result->ptr;