- MFH: Better fix

diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 36da8dbe3fda58febdd04035a03d5e4445adb6bf..c34b8adf3da23bb00982afaac1b800f1058c6e54 100644 (file)
--- 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);
                        }
 

diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index d9ac6ef2ec1100ff4f5383e7fec2e0dea15a2c8f..60f49c1809d1aa43ade1dd4a356fa698a88981f1 100644 (file)
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -299,9 +299,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;
@@ -318,21 +317,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);
                        }