com php-src: Merge remote-tracking branch 'phpdbg/master' into PHP-5.6: phpdbg_watch.c

From: Date: Sun, 27 Apr 2014 16:01:26 +0000
Subject: com php-src: Merge remote-tracking branch 'phpdbg/master' into PHP-5.6: phpdbg_watch.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82808@lists.php.net to get a copy of this message
Commit: a1edc8e396f09b0bdd997d80ac778738e4c5dc83 Author: Anatol Belski <ab@php.net> Sun, 27 Apr 2014 18:01:26 +0200 Parents: 9a8123fabbdeea05d9b94638d09efb1440004d50 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a1edc8e396f09b0bdd997d80ac778738e4c5dc83 Log: Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 * phpdbg/master: C89 compat Changed paths: M phpdbg_watch.c Diff: diff --git a/phpdbg_watch.c b/phpdbg_watch.c index 0359b5a..2efbb12 100644 --- a/phpdbg_watch.c +++ b/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;

« previous php.cvs (#82808) next »