tony2001 Mon May 29 20:26:12 2006 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
return NULL in case of error (and fix leak/non-null-terminated string error)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.181&r2=1.182&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.181 php-src/ext/pcre/php_pcre.c:1.182
--- php-src/ext/pcre/php_pcre.c:1.181 Tue May 9 18:28:11 2006
+++ php-src/ext/pcre/php_pcre.c Mon May 29 20:26:12 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.181 2006/05/09 18:28:11 andrei Exp $ */
+/* $Id: php_pcre.c,v 1.182 2006/05/29 20:26:12 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1115,6 +1115,10 @@
}
} else {
pcre_handle_exec_error(count TSRMLS_CC);
+ if (result) {
+ efree(result);
+ result = NULL;
+ }
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php