diff options
author | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2012-02-02 16:22:43 +0100 |
commit | b6284c07d03a04d737467c0bba1dc268be85c9e1 (patch) | |
tree | 7bb7d6362aec024912ce83d0717d656ffad3db66 /ext/mbstring/php_mbregex.c | |
parent | 047c0f130629403041f97af7705453f5ff33df9f (diff) | |
download | php-b6284c07d03a04d737467c0bba1dc268be85c9e1.tar.gz |
Imported Upstream version 5.4.0~rc6
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
-rw-r--r-- | ext/mbstring/php_mbregex.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |