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

Fixed REFERENCE handling

Browse source
This commit is contained in:
Xinchen Hui 2014-05-08 16:11:50 +08:00
parent c242518bf0
commit be79628b87
4 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ext/pdo/pdo_sql_parser.c
View file

@ -527,7 +527,7 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
if (query_type != PDO_PLACEHOLDER_POSITIONAL && bindno > zend_hash_num_elements(params)) {
int ok = 1;
for (plc = placeholders; plc; plc = plc->next) {
if ((params = zend_hash_str_find_ptr(params, plc->pos, plc->len)) == NULL) {
if ((param = zend_hash_str_find_ptr(params, plc->pos, plc->len)) == NULL) {
ok = 0;
break;
}
@ -561,10 +561,16 @@ safe:
goto clean_up;
}
if (stmt->dbh->methods->quoter) {
if (param->param_type == PDO_PARAM_LOB && Z_TYPE(param->parameter) == IS_RESOURCE) {
zval *parameter;
if (Z_ISREF(param->parameter)) {
parameter = Z_REFVAL(param->parameter);
} else {
parameter = &param->parameter;
}
if (param->param_type == PDO_PARAM_LOB && Z_TYPE_P(parameter) == IS_RESOURCE) {
php_stream *stm;
php_stream_from_zval_no_verify(stm, &param->parameter);
php_stream_from_zval_no_verify(stm, parameter);
if (stm) {
zend_string *buf;
@ -590,7 +596,7 @@ safe:
plc->freeq = 1;
} else {
zval tmp_param;
ZVAL_DUP(&tmp_param, &param->parameter);
ZVAL_DUP(&tmp_param, parameter);
switch (Z_TYPE(tmp_param)) {
case IS_NULL:
plc->quoted = "NULL";
@ -625,8 +631,14 @@ safe:
zval_dtor(&tmp_param);
}
} else {
plc->quoted = Z_STRVAL(param->parameter);
plc->qlen = Z_STRLEN(param->parameter);
zval *parameter;
if (Z_ISREF(param->parameter)) {
parameter = Z_REFVAL(param->parameter);
} else {
parameter = &param->parameter;
}
plc->quoted = Z_STRVAL_P(parameter);
plc->qlen = Z_STRLEN_P(parameter);
}
newbuffer_len += plc->qlen;
}