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

implement zend_unicode_to_string() and zend_string_to_unicode()

Browse source 
part #2 (of 2)
This commit is contained in:
Antony Dovgal 2006-08-08 16:59:11 +00:00
parent f5715ee86f
commit dbe2092313
18 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/php_variables.c
View file

@ -372,8 +372,8 @@ last_value:
php_url_decode(var, var_len);
val++;
val_len = php_url_decode(val, (p - val));
zend_convert_to_unicode(input_conv, &u_var, &u_var_len, var, var_len, &status1);
zend_convert_to_unicode(input_conv, &u_val, &u_val_len, val, val_len, &status2);
zend_string_to_unicode_ex(input_conv, &u_var, &u_var_len, var, var_len, &status1);
zend_string_to_unicode_ex(input_conv, &u_val, &u_val_len, val, val_len, &status2);
if (U_SUCCESS(status1) && U_SUCCESS(status2)) {
/* UTODO add input filtering */
php_u_register_variable_safe(u_var, u_val, u_val_len, array_ptr TSRMLS_CC);
@ -515,7 +515,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data)
int u_var_len, u_val_len;
UErrorCode status = U_ZERO_ERROR;
zend_convert_to_unicode(input_conv, &u_var, &u_var_len, var, var_len, &status);
zend_string_to_unicode_ex(input_conv, &u_var, &u_var_len, var, var_len, &status);
if (U_FAILURE(status)) {
/* UTODO set a user-accessible flag to indicate that conversion failed? */
efree(u_var);
@ -527,7 +527,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data)
unsigned int new_val_len;
val_len = php_url_decode(val, strlen(val));
zend_convert_to_unicode(input_conv, &u_val, &u_val_len, val, val_len, &status);
zend_string_to_unicode_ex(input_conv, &u_val, &u_val_len, val, val_len, &status);
if (U_FAILURE(status)) {
/* UTODO set a user-accessible flag to indicate that conversion failed? */
efree(u_var);