From b6284c07d03a04d737467c0bba1dc268be85c9e1 Mon Sep 17 00:00:00 2001 From: Ondřej Surý Date: Wed, 1 Feb 2012 21:25:15 +0100 Subject: Imported Upstream version 5.4.0~rc6 --- ext/mbstring/php_mbregex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mbstring/php_mbregex.c') diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 8c2fd7abd..d224b9ca6 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -372,7 +372,7 @@ static OnigEncoding _php_mb_regex_name2mbctype(const char *pname) const char *p; php_mb_regex_enc_name_map_t *mapping; - if (pname == NULL) { + if (pname == NULL || !*pname) { return ONIG_ENCODING_UNDEF; } -- cgit v1.2.3