diff options
| author | Anatol Belski <ab@php.net> | 2014-04-27 18:01:26 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-27 18:01:26 +0200 |
| commit | 3b6bf6eec87aa52f5fc98df341d7e101f72a72e2 (patch) | |
| tree | ca2f469c48f5b740f525b1f0d3545752afa4cb16 /sapi/phpdbg/phpdbg_watch.c | |
| parent | a10dc3aa4f1571bde0db7edf8a6e4780026ea63a (diff) | |
| parent | 4aa80db758259ec3ce255aaa084cb38f41fc02f1 (diff) | |
| download | php-git-3b6bf6eec87aa52f5fc98df341d7e101f72a72e2.tar.gz | |
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
* phpdbg/master:
C89 compat
Diffstat (limited to 'sapi/phpdbg/phpdbg_watch.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_watch.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c index 0359b5a7de..2efbb1237c 100644 --- 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; |