diff options
| author | Jani Taskinen <jani@php.net> | 2009-04-20 17:06:03 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-04-20 17:06:03 +0000 |
| commit | a0f3cf5cc4a42850b940da33a0b912268286bfd3 (patch) | |
| tree | 17506bf1020a8a4d5fd6ea52fd91feef478a112d /ext/mbstring/php_unicode.c | |
| parent | eae5e432433409514af2c9c477d4b898e8adf86c (diff) | |
| download | php-git-a0f3cf5cc4a42850b940da33a0b912268286bfd3.tar.gz | |
MFB: Thanks to the "maintainers" who are too lazy to commit FIRST to HEAD!
Diffstat (limited to 'ext/mbstring/php_unicode.c')
| -rw-r--r-- | ext/mbstring/php_unicode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c index 406069576e..2abad1330b 100644 --- a/ext/mbstring/php_unicode.c +++ b/ext/mbstring/php_unicode.c @@ -98,7 +98,6 @@ static int prop_lookup(unsigned long code, unsigned long n) } - MBSTRING_API int php_unicode_is_prop(unsigned long code, unsigned long mask1, unsigned long mask2) { @@ -277,6 +276,11 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s size_t i; enum mbfl_no_encoding _src_encoding = mbfl_name2no_encoding(src_encoding); + if (_src_encoding == mbfl_no_encoding_invalid) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", src_encoding); + return NULL; + } + unicode = php_mb_convert_encoding(srcstr, srclen, "UCS-4BE", src_encoding, &unicode_len TSRMLS_CC); if (unicode == NULL) return NULL; |