mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed segfaults in case the specified encoding is not acceptable to iconv.

Browse Source
This commit is contained in:
Moriyoshi Koizumi 2002-11-06 16:29:16 +00:00
parent 6789057697
commit 49f15ab314
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/iconv/iconv.c
View File

@ -251,8 +251,10 @@ php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
if (cd == (iconv_t)(-1)) {
if (errno == EINVAL) {
*out = NULL;
return PHP_ICONV_ERR_WRONG_CHARSET;
} else {
*out = NULL;
return PHP_ICONV_ERR_CONVERTER;
}
}
@ -263,11 +265,11 @@ php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
out_buf = (char *) emalloc(bsz+1);
out_p = out_buf;
while(in_left > 0) {
while (in_left > 0) {
result = icv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
out_size = bsz - out_left;
if( result == (size_t)(-1) ) {
if( errno == E2BIG && in_left > 0 ) {
if (result == (size_t)(-1)) {
if (errno == E2BIG && in_left > 0) {
/* converted string is longer than out buffer */
bsz += in_len;