com php-src: Fixed recursive segfault in segfault handler: phpdbg_watch.c

From: Date: Sat, 08 Mar 2014 14:52:57 +0000
Subject: com php-src: Fixed recursive segfault in segfault handler: phpdbg_watch.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77031@lists.php.net to get a copy of this message
Commit: 37ca791a91f3364f6f67c3ed79bb3ce930ad77f1 Author: Bob Weinand <bobwei9@hotmail.com> Sat, 8 Mar 2014 09:52:57 -0500 Parents: ab16299355c4c739668a2d96a1075fd67c70bd62 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=37ca791a91f3364f6f67c3ed79bb3ce930ad77f1 Log: Fixed recursive segfault in segfault handler Changed paths: M phpdbg_watch.c Diff: diff --git a/phpdbg_watch.c b/phpdbg_watch.c index 18c3f44..50d6a90 100644 --- a/phpdbg_watch.c +++ b/phpdbg_watch.c @@ -398,7 +398,7 @@ int phpdbg_watchpoint_segfault_handler(siginfo_t *info, void *context TSRMLS_DC) /* re-enable writing */ mprotect(page, size, PROT_NONE | PROT_READ | PROT_WRITE); - dump = emalloc(MEMDUMP_SIZE(size)); + dump = malloc(MEMDUMP_SIZE(size)); dump->page = page; dump->size = size; @@ -431,7 +431,7 @@ static void phpdbg_watch_mem_dtor(void *llist_data) { void *page = (*(phpdbg_watch_memdump **)llist_data)->page; size_t size = (*(phpdbg_watch_memdump **)llist_data)->size; - efree(*(void **)llist_data); + free(*(void **)llist_data); /* Disble writing again */ mprotect(page, size, PROT_NONE | PROT_READ); @@ -448,7 +448,7 @@ void phpdbg_setup_watchpoints(TSRMLS_D) { phpdbg_pagesize = sysconf(_SC_NUTC_OS_PAGESIZE); #endif - zend_llist_init(&PHPDBG_G(watchlist_mem), sizeof(void *), phpdbg_watch_mem_dtor, 0); + zend_llist_init(&PHPDBG_G(watchlist_mem), sizeof(void *), phpdbg_watch_mem_dtor, 1); phpdbg_btree_init(&PHPDBG_G(watchpoint_tree), sizeof(void *) * 8); _zend_hash_init(&PHPDBG_G(watchpoints), 8, phpdbg_watch_dtor, 0 ZEND_FILE_LINE_CC); }

« previous php.cvs (#77031) next »