archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Switch name variable to zend_string

Browse source
This commit is contained in:
Nikita Popov 2021-01-07 11:17:21 +01:00 • committed by George Peter Banyard
parent 7aa00369b0
commit 792f8fb1b5
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/pdo/pdo_sql_parser.re
View file

@ -339,7 +339,6 @@ rewrite:
} else if (query_type == PDO_PLACEHOLDER_POSITIONAL) {
/* rewrite ? to :pdoX */
char *name;
const char *tmpl = stmt->named_rewrite_template ? stmt->named_rewrite_template : ":pdo%d";
int bind_no = 1;
@ -359,10 +358,10 @@ rewrite:
continue;
}
name = estrndup(plc->pos, plc->len);
zend_string *name = zend_string_init(plc->pos, plc->len, 0);
/* check if bound parameter is already available */
if (!strcmp(name, "?") || (p = zend_hash_str_find_ptr(stmt->bound_param_map, name, plc->len)) == NULL) {
if (zend_string_equals_literal(name, "?") || (p = zend_hash_find_ptr(stmt->bound_param_map, name)) == NULL) {
idxbuf = zend_strpprintf(0, tmpl, bind_no++);
} else {
idxbuf = zend_string_copy(p);
@ -374,13 +373,13 @@ rewrite:
if (!skip_map && stmt->named_rewrite_template) {
/* create a mapping */
zend_hash_str_update_ptr(stmt->bound_param_map, name, plc->len, zend_string_copy(plc->quoted));
zend_hash_update_ptr(stmt->bound_param_map, name, zend_string_copy(plc->quoted));
}
/* map number to name */
zend_hash_index_update_ptr(stmt->bound_param_map, plc->bindno, zend_string_copy(plc->quoted));
efree(name);
zend_string_release(name);
}
goto rewrite;