rasmus Fri Apr 23 13:51:40 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/pcre php_pcre.c
Log:
bug #27810 from Joe Orton
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.646&r2=1.1247.2.647&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.646 php-src/NEWS:1.1247.2.647
--- php-src/NEWS:1.1247.2.646 Fri Apr 23 13:04:36 2004
+++ php-src/NEWS Fri Apr 23 13:51:38 2004
@@ -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()
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.132.2.16&r2=1.132.2.17&ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.132.2.16 php-src/ext/pcre/php_pcre.c:1.132.2.17
--- php-src/ext/pcre/php_pcre.c:1.132.2.16 Sun Feb 1 14:56:16 2004
+++ php-src/ext/pcre/php_pcre.c Fri Apr 23 13:51:39 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.132.2.16 2004/02/01 19:56:16 moriyoshi Exp $ */
+/* $Id: php_pcre.c,v 1.132.2.17 2004/04/23 17:51:39 rasmus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -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 @@
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 @@
}
}
- php_pcre_free((void *) stringlist);
+ pcre_free((void *) stringlist);
}
}
else { /* Failed to match */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
