James Hawkins : msi: Don't allow nested quotes in SQL queries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7f3faffc3b3c7905a33abc537a28fbddde3ad16d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7f3faffc3b3c7905a33abc537a...

Author: James Hawkins 
Date:   Mon Mar  2 02:34:17 2009 -0800

msi: Don't allow nested quotes in SQL queries.

---

dlls/msi/tests/db.c |   17 ++++-------------
 dlls/msi/tokenize.c |    9 ++-------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 29a87f6..e5ada2b 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -5257,10 +5257,7 @@ static void test_quotes(void)

query = "INSERT INTO `Table` ( `A` ) VALUES ( 'This is a ''string'' ok' )";
     r = run_query(hdb, 0, query);
-    todo_wine
-    {
-        ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r);
-    }
+    ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r);

query = "INSERT INTO `Table` ( `A` ) VALUES ( 'This is a '''string''' ok' )";
     r = run_query(hdb, 0, query);
@@ -5287,19 +5284,13 @@ static void test_quotes(void)
     size = MAX_PATH;
     r = MsiRecordGetString(hrec, 1, buf, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    todo_wine
-    {
-        ok(!lstrcmp(buf, "This is a "string" ok"),
-           "Expected "This is a "string" ok", got %s\n", buf);
-    }
+    ok(!lstrcmp(buf, "This is a "string" ok"),
+       "Expected "This is a "string" ok", got %s\n", buf);

MsiCloseHandle(hrec);

r = MsiViewFetch(hview, &hrec);
-    todo_wine
-    {
-        ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
-    }
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);

MsiViewClose(hview);
     MsiCloseHandle(hview);
diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c
index aec6f27..b92e2a0 100644
--- a/dlls/msi/tokenize.c
+++ b/dlls/msi/tokenize.c
@@ -254,13 +254,8 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){
     case '`': case ''': {
       int delim = z[0];
       for(i=1; z[i]; i++){
-        if( z[i]==delim ){
-          if( z[i+1]==delim ){
-            i++;
-          }else{
-            break;
-          }
-        }
+        if( z[i]==delim )
+          break;
       }
       if( z[i] ) i++;
       if( delim == '`' )