fix a bug where PHP would enter in an infinite cycle with chars with ascii value...

while at it, remove the lim structure parameter (it wasn't being used)

diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 8c2f0c6c84603e8968cb18ed90ad7afb250012fb..4355a97e68f37b0a82fb7fa2e772b3067341ce51 100644 (file)
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.10.6 on Sat Dec  9 17:16:39 2007 */
+/* Generated by re2c 0.10.4 on Wed Jan  3 22:02:19 2007 */
 #line 1 "ext/pdo/pdo_sql_parser.re"
 /*
   +----------------------------------------------------------------------+
@@ -31,14 +31,14 @@
 
 #define RET(i) {s->cur = cursor; return i; }
 
-#define YYCTYPE         char
+#define YYCTYPE         unsigned char
 #define YYCURSOR        cursor
-#define YYLIMIT         s->lim
+#define YYLIMIT         cursor
 #define YYMARKER        s->ptr
 #define YYFILL(n)
 
 typedef struct Scanner {
-       char    *lim, *ptr, *cur, *tok;
+       char    *ptr, *cur, *tok;
 } Scanner;
 
 static int scan(Scanner *s) 
@@ -263,7 +263,6 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
 
        ptr = *outquery;
        s.cur = inquery;
-       s.lim = inquery + inquery_len;
 
        /* phase 1: look for args */
        while((t = scan(&s)) != PDO_PARSER_EOI) {
@@ -578,7 +577,6 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
 
        ptr = *outquery;
        s.cur = inquery;
-       s.lim = inquery + inquery_len;
        while((t = scan(&s)) != PDO_PARSER_EOI) {
                if(t == PDO_PARSER_TEXT) {
                        memcpy(ptr, s.tok, s.cur - s.tok);

diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index 9bb5cc0bf496a1b5c9ae54642d6bf6a69d90ff8e..c5c8cbaaf44ed3a159bb62962632fd4f3cb13532 100644 (file)
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2006 The PHP Group                                |
+  | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -29,14 +29,14 @@
 
 #define RET(i) {s->cur = cursor; return i; }
 
-#define YYCTYPE         char
+#define YYCTYPE         unsigned char
 #define YYCURSOR        cursor
-#define YYLIMIT         s->lim
+#define YYLIMIT         cursor
 #define YYMARKER        s->ptr
 #define YYFILL(n)
 
 typedef struct Scanner {
-       char    *lim, *ptr, *cur, *tok;
+       char    *ptr, *cur, *tok;
 } Scanner;
 
 static int scan(Scanner *s) 
@@ -90,7 +90,6 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
 
        ptr = *outquery;
        s.cur = inquery;
-       s.lim = inquery + inquery_len;
 
        /* phase 1: look for args */
        while((t = scan(&s)) != PDO_PARSER_EOI) {
@@ -405,7 +404,6 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
 
        ptr = *outquery;
        s.cur = inquery;
-       s.lim = inquery + inquery_len;
        while((t = scan(&s)) != PDO_PARSER_EOI) {
                if(t == PDO_PARSER_TEXT) {
                        memcpy(ptr, s.tok, s.cur - s.tok);