From: Hannes Magnusson <bjori@php.net>
Date: Fri, 3 Nov 2006 14:11:23 +0000 (+0000)
Subject: MFH: fix crash on invalid regex
X-Git-Tag: php-5.2.1RC1~365
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bece30aee57de12bffffba2fd1d455c39cd4c7f4;p=php

MFH: fix crash on invalid regex
---

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 195c500355..eadb2ed691 100755
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1012,8 +1012,13 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
 			intern->u.regex.mode = mode;
 			intern->u.regex.regex = estrndup(regex, regex_len);
 			intern->u.regex.pce = pcre_get_compiled_regex_cache(regex, regex_len TSRMLS_CC);
+			if (intern->u.regex.pce == NULL) {
+				/* pcre_get_compiled_regex_cache has already sent error */
+				php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
+				return NULL;
+			}
 			intern->u.regex.pce->refcount++;
-			break;;
+			break;
 		}
 #endif
 		default: