diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:38:30 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:38:30 -0400 |
| commit | 1f589a2bd44ba835ad1b009a5d83abd453724829 (patch) | |
| tree | ec84d715d1ff049cc61f5eaf18db21eb7f3bab40 /ext/pcre/php_pcre.c | |
| parent | bb01389fbd53ec1cbcb80d0681a37cca1267891a (diff) | |
| download | php-1f589a2bd44ba835ad1b009a5d83abd453724829.tar.gz | |
Imported Upstream version 5.2.5upstream/5.2.5
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index e7f41fa2b..2cf8ed3a1 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -16,11 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.19 2007/07/24 22:35:18 tony2001 Exp $ */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +/* $Id: php_pcre.c,v 1.168.2.9.2.21 2007/09/20 08:10:44 tony2001 Exp $ */ #include "php.h" #include "php_ini.h" @@ -1224,8 +1220,11 @@ static char *php_replace_in_subject(zval *regex, zval *replace, zval **subject, efree(subject_value); subject_value = result; subject_len = *result_len; + } else { + efree(subject_value); + return NULL; } - + zend_hash_move_forward(Z_ARRVAL_P(regex)); } |