felipe Thu Nov 13 23:23:11 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo pdo_sql_parser.c pdo_sql_parser.re
Log:
- MFH: Better fix
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.6.2.19&r2=1.35.2.6.2.20&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.19
php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.20
--- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.19 Thu Nov 13 14:53:55 2008
+++ php-src/ext/pdo/pdo_sql_parser.c Thu Nov 13 23:23:11 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.6.dev on Thu Nov 13 12:51:46 2008 */
+/* Generated by re2c 0.13.6.dev on Thu Nov 13 21:23:12 2008 */
#line 1 "ext/pdo/pdo_sql_parser.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.19 2008/11/13 14:53:55 felipe Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.20 2008/11/13 23:23:11 felipe Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -550,9 +550,8 @@
} 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 @@
/* 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, sizeof(idxbuf));
+ 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);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.16&r2=1.28.2.4.2.17&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.16
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.17
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.16 Thu Nov 13 14:53:55 2008
+++ php-src/ext/pdo/pdo_sql_parser.re Thu Nov 13 23:23:11 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.16 2008/11/13 14:53:55 felipe Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.17 2008/11/13 23:23:11 felipe Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -299,9 +299,8 @@
} 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;
@@ -318,21 +317,19 @@
/* 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, sizeof(idxbuf));
+ 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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
