From: Felipe Pena <felipe@php.net>
Date: Thu, 13 Nov 2008 13:07:50 +0000 (+0000)
Subject: - Fixed invalid reads
X-Git-Tag: BEFORE_HEAD_NS_CHANGES_MERGE~186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c37e9fd8bb54779223d0316502e7469bf931b493;p=php

- Fixed invalid reads
---

diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 492aa50c80..664c840e50 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Oct 23 16:16:52 2008 */
+/* Generated by re2c 0.13.6.dev on Thu Nov 13 11:03:30 2008 */
 #line 1 "ext/pdo/pdo_sql_parser.re"
 /*
   +----------------------------------------------------------------------+
@@ -572,7 +572,7 @@ rewrite:
 				snprintf(idxbuf, sizeof(idxbuf), tmpl, bind_no++);
 			} else {
 				memset(idxbuf, 0, sizeof(idxbuf));
-				memcpy(idxbuf, p, sizeof(idxbuf));
+				memcpy(idxbuf, p, strlen(p));
 				skip_map = 1;
 			}
 
diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index 9a7f5e32b3..b41dc21095 100644
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -321,7 +321,7 @@ rewrite:
 				snprintf(idxbuf, sizeof(idxbuf), tmpl, bind_no++);
 			} else {
 				memset(idxbuf, 0, sizeof(idxbuf));
-				memcpy(idxbuf, p, sizeof(idxbuf));
+				memcpy(idxbuf, p, strlen(p));
 				skip_map = 1;
 			}