diff options
| author | Felipe Pena <felipe@php.net> | 2008-11-13 18:14:50 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-11-13 18:14:50 +0000 |
| commit | c29ebd8a23cf1127d6b0d42fd2cc604834d3b84e (patch) | |
| tree | 0bd9961996f74b559b982ab0281c1cf202c38b37 /ext/pdo/pdo_sql_parser.c | |
| parent | c8103324bf2561efda883169e8f65de82871e923 (diff) | |
| download | php-git-c29ebd8a23cf1127d6b0d42fd2cc604834d3b84e.tar.gz | |
- MFH: Better fix
Diffstat (limited to 'ext/pdo/pdo_sql_parser.c')
| -rw-r--r-- | ext/pdo/pdo_sql_parser.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c index 36da8dbe3f..c34b8adf3d 100644 --- a/ext/pdo/pdo_sql_parser.c +++ b/ext/pdo/pdo_sql_parser.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.6.dev on Thu Nov 13 10:17:38 2008 */ +/* Generated by re2c 0.13.6.dev on Thu Nov 13 14:47:06 2008 */ #line 1 "ext/pdo/pdo_sql_parser.re" /* +----------------------------------------------------------------------+ @@ -550,9 +550,8 @@ rewrite: } else if (query_type == PDO_PLACEHOLDER_POSITIONAL) { /* rewrite ? to :pdoX */ - char idxbuf[32]; + char *name, *idxbuf; const char *tmpl = stmt->named_rewrite_template ? stmt->named_rewrite_template : ":pdo%d"; - char *name; int bind_no = 1; newbuffer_len = inquery_len; @@ -569,21 +568,19 @@ rewrite: /* check if bound parameter is already available */ if (!strcmp(name, "?") || zend_hash_find(stmt->bound_param_map, name, plc->len + 1, (void**) &p) == FAILURE) { - snprintf(idxbuf, sizeof(idxbuf), tmpl, bind_no++); + spprintf(&idxbuf, 0, tmpl, bind_no++); } else { - memset(idxbuf, 0, sizeof(idxbuf)); - memcpy(idxbuf, p, strlen(p)); + idxbuf = estrdup(p); skip_map = 1; } - plc->quoted = estrdup(idxbuf); + plc->quoted = idxbuf; plc->qlen = strlen(plc->quoted); plc->freeq = 1; newbuffer_len += plc->qlen; if (!skip_map && stmt->named_rewrite_template) { /* create a mapping */ - zend_hash_update(stmt->bound_param_map, name, plc->len + 1, idxbuf, plc->qlen + 1, NULL); } |