From: Felipe Pena <felipe@php.net>
Date: Thu, 13 Nov 2008 18:14:31 +0000 (+0000)
Subject: - Better fix
X-Git-Tag: BEFORE_HEAD_NS_CHANGES_MERGE~183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed247d6d41947f7d082cbeaf62f2a4c479c96c6d;p=php

- Better fix
---

diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 664c840e50..8a437fbd01 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 11:03:30 2008 */
+/* Generated by re2c 0.13.6.dev on Thu Nov 13 16:01:30 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 b41dc21095..43e0cf9553 100644
--- 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);
 			}