tony2001                Tue Sep 19 11:49:00 2006 UTC

  Modified files:              
    /php-src/ext/pcre   php_pcre.c 
  Log:
  fix leak in preg_split()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.199&r2=1.200&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.199 php-src/ext/pcre/php_pcre.c:1.200
--- php-src/ext/pcre/php_pcre.c:1.199   Mon Sep 18 20:16:36 2006
+++ php-src/ext/pcre/php_pcre.c Tue Sep 19 11:48:59 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_pcre.c,v 1.199 2006/09/18 20:16:36 andrei Exp $ */
+/* $Id: php_pcre.c,v 1.200 2006/09/19 11:48:59 tony2001 Exp $ */
 
 /* UTODO
  *  - PCRE_NO_UTF8_CHECK option for Unicode strings
@@ -1485,11 +1485,11 @@
 
        /* Compile regex or get it from cache. */
        if ((pce = pcre_get_compiled_regex_cache(regex.s, regex_len TSRMLS_CC)) 
== NULL) {
-               RETURN_FALSE;
                if (str_type == IS_UNICODE) {
                        efree(regex_utf8);
                        efree(subject_utf8);
                }
+               RETURN_FALSE;
        }
 
        php_pcre_split_impl(pce, subject.s, subject_len, return_value, 
limit_val, flags TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to