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

Better use buffer_to_buffer, since zval is really buffer, not string (it can

Browse source 
contain \0's and not end in \0).
# and recode_string is recode_buffer_to_buffer internally anyways
This commit is contained in:
Stanislav Malyshev 2001-03-08 17:11:57 +00:00
parent a4a8369f7d
commit e30d8e4abf
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/recode/recode.c
View file

@ -111,6 +111,7 @@ PHP_FUNCTION(recode_string)
pval **str;
pval **req;
bool success;
int r_len=0, r_alen =0;
ReSLS_FETCH();
if (ZEND_NUM_ARGS() != 2
@ -132,13 +133,13 @@ PHP_FUNCTION(recode_string)
goto error_exit;
}
r = recode_string(request, (*str)->value.str.val);
recode_buffer_to_buffer(request, Z_STRVAL_PP(str), Z_STRLEN_PP(str), &r, &r_len, &r_alen);
if (!r) {
php_error(E_WARNING, "Recoding failed.");
goto error_exit;
}
RETVAL_STRING(r, 1);
RETVAL_STRINGL(r, r_len, 1);
free(r);
/* FALLTHROUGH */