archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Handle bogus string in intl_charFromString().

Browse source
This commit is contained in:
Gustavo André dos Santos Lopes 2012-04-30 15:29:36 +02:00
parent 81d8f4079c
commit 30bf2fbb9d
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/intl/intl_convertcpp.cpp
View file

@ -48,9 +48,16 @@ int intl_stringFromChar(UnicodeString &ret, char *str, int32_t str_len, UErrorCo
} }
/* }}} */ /* }}} */
/* {{{ intl_charFromString */ /* {{{ intl_charFromString
* faster than doing intl_convert_utf16_to_utf8(&res, &res_len,
* from.getBuffer(), from.length(), &status),
* but consumes more memory */
int intl_charFromString(const UnicodeString &from, char **res, int *res_len, UErrorCode *status) int intl_charFromString(const UnicodeString &from, char **res, int *res_len, UErrorCode *status)
{ {
if (from.isBogus()) {
return FAILURE;
}
//the number of UTF-8 code units is not larger than that of UTF-16 code //the number of UTF-8 code units is not larger than that of UTF-16 code
//units * 3 + 1 for the terminator //units * 3 + 1 for the terminator
int32_t capacity = from.length() * 3 + 1; int32_t capacity = from.length() * 3 + 1;