danog/ext-pq
1
0
Fork 0
mirror of https://github.com/danog/ext-pq.git synced 2024-11-30 04:19:49 +01:00
Code Issues Projects Releases Wiki Activity

fix for 7.3.0alpha4

Browse Source
This commit is contained in:
Remi Collet 2018-07-18 07:39:47 +02:00
parent e9eb250ea0
commit 950b257a93
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/php_pq_params.c
View File

@ -123,7 +123,7 @@ static int apply_to_param_from_array(zval *zparam, void *arg_ptr)
struct apply_to_param_from_array_arg subarg, *arg = arg_ptr; struct apply_to_param_from_array_arg subarg, *arg = arg_ptr;
char *tmp; char *tmp;
size_t len; size_t len;
zend_string *str; zend_string *str, *tmpstr;
if (arg->index++) { if (arg->index++) {
smart_str_appendc(arg->buffer, arg->delim); smart_str_appendc(arg->buffer, arg->delim);
@ -134,7 +134,7 @@ static int apply_to_param_from_array(zval *zparam, void *arg_ptr)
ZVAL_LONG(&ztype, arg->type); ZVAL_LONG(&ztype, arg->type);
zend_call_method_with_2_params(arg->zconv, NULL, NULL, "converttostring", &rv, zparam, &ztype); zend_call_method_with_2_params(arg->zconv, NULL, NULL, "converttostring", &rv, zparam, &ztype);
str = zval_get_string(&rv); tmpstr = zval_get_string(&rv);
zval_ptr_dtor(&rv); zval_ptr_dtor(&rv);
goto append_string; goto append_string;
@ -176,15 +176,20 @@ static int apply_to_param_from_array(zval *zparam, void *arg_ptr)
break; break;
case IS_OBJECT: case IS_OBJECT:
if ((str = object_param_to_string(arg->params, zparam, arg->type))) { if ((tmpstr = object_param_to_string(arg->params, zparam, arg->type))) {
goto append_string; goto append_string;
} }
/* no break */ /* no break */
default: default:
str = zval_get_string(zparam); tmpstr = zval_get_string(zparam);
append_string: append_string:
str = php_addslashes(str, 1); #if PHP_VERSION_ID < 70300
str = php_addslashes(tmpstr, 1);
#else
str = php_addslashes(tmpstr);
zend_string_release(tmpstr);
#endif
smart_str_appendc(arg->buffer, '"'); smart_str_appendc(arg->buffer, '"');
smart_str_appendl(arg->buffer, str->val, str->len); smart_str_appendl(arg->buffer, str->val, str->len);
smart_str_appendc(arg->buffer, '"'); smart_str_appendc(arg->buffer, '"');