From 2d9549455d7c6c08e80341d8a9cce48e3cc536ac Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Fri, 23 Apr 2004 17:51:39 +0000 Subject: [PATCH] bug #27810 from Joe Orton --- NEWS | 1 + ext/pcre/php_pcre.c | 24 +----------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NEWS b/NEWS index 54cc74cbb5..5ca911cdc6 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2004, Version 4.3.7 +- Fixed bug #27810 (don't use php's pemalloc in ext/pcre). (Joe Orton) - Fixed possible crash inside pg_copy_(to|from) function if delimiter is more then 1 character long. (Ilia) - Fixed handling of return values from storred procedures in mssql_execute() diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 68ea54b8e9..3bed679a01 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -47,20 +47,6 @@ ZEND_DECLARE_MODULE_GLOBALS(pcre) - -static void *php_pcre_malloc(size_t size) -{ - return pemalloc(size, 1); -} - - -static void php_pcre_free(void *ptr) -{ - if (ptr) - pefree(ptr, 1); -} - - static void php_free_pcre_cache(void *data) { pcre_cache_entry *pce = (pcre_cache_entry *) data; @@ -107,14 +93,6 @@ static PHP_MINIT_FUNCTION(pcre) REGISTER_LONG_CONSTANT("PREG_SPLIT_OFFSET_CAPTURE", PREG_SPLIT_OFFSET_CAPTURE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PREG_GREP_INVERT", PREG_GREP_INVERT, CONST_CS | CONST_PERSISTENT); - pcre_malloc = php_pcre_malloc; - pcre_free = php_pcre_free; - -#ifdef NO_RECURSE - pcre_stack_malloc = php_pcre_malloc; - pcre_stack_free = php_pcre_free; -#endif - return SUCCESS; } /* }}} */ @@ -548,7 +526,7 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) } } - php_pcre_free((void *) stringlist); + pcre_free((void *) stringlist); } } else { /* Failed to match */ -- 2.50.1