From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 23 Apr 2004 18:08:58 +0000 (+0000)
Subject: MFB: Fix for bug #27810
X-Git-Tag: php-5.0.0RC2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=191a661f8c764fdf1730be806a9fb4f177679028;p=php

MFB: Fix for bug #27810
---

diff --git a/NEWS b/NEWS
index e70fc8a87d..3f711eb5ec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ????? 2004, PHP 5 Release Candidate 2
+- Fix for bug #27810 (Joe Orton)
 - Reimplemented zend.ze1_compatibility_mode to have better PHP 4 compliance.
   (Dmitry, Andi)
 - Moved yaz extension to PECL. (Wez)
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 1e0a468c37..7c848b2e2b 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;
 }
 /* }}} */
@@ -560,7 +538,7 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
 					}
 				}
 
-				php_pcre_free((void *) stringlist);
+				pcre_free((void *) stringlist);
 			}
 		}
 		else { /* Failed to match */