In setQuotedToken(), only make a malloced copy if the argument contains one or more...

FossilOrigin-Name: b266924b8975b69bdb9ab45cf462e41436f89cc2

diff --git a/manifest b/manifest
index cb52e3584eff87b21be8514ced1177f2ff9f719b..b12265afe77c275fd95fdeb687d9bb23a1e2290f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanup:\sUse\ssize_t\sfor\sstruct\ssize\scast\s(CVS\s4940)
-D 2008-03-29T23:25:27
+C In\ssetQuotedToken(),\sonly\smake\sa\smalloced\scopy\sif\sthe\sargument\scontains\sone\sor\smore\s"\scharacters.\s(CVS\s4941)
+D 2008-03-31T17:41:18
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in cf434ce8ca902e69126ae0f94fc9f7dc7428a5fa
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -135,7 +135,7 @@ F src/pragma.c e659c9e443d11854cff2fd250012365ae0ca81ba
 F src/prepare.c 185fb47f1fb3e45a345d523eb391d673f5eb367c
 F src/printf.c 05d2b44d7b5b80c8a4a09108ddad9c20e254370d
 F src/random.c 2b2db2de4ab491f5a14d3480466f8f4b5a5db74a
-F src/select.c f47faa4af940d0acd0cff92a1a77ebb27331a31a
+F src/select.c 61fcc616b6c50da1a8f5604f9766e352f69760a8
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 22297fffa6f00a6c6d44020fa13b1184a1bb372d
 F src/sqlite.h.in b1ac824d9fc163a5d2226ebf5990b09a02a11117
@@ -619,7 +619,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 2d9fea95335ab8f399868f63c51bee89ed7633fa
-R d3d2e40b36f2816c97d23232dd10b170
-U mlcreech
-Z 6f382d3423b61a9e7296357f5beb1835
+P 618df68b8b78d376d30cea79a273fd39140f5033
+R 90b5f03ff5ebb83c1c1b0247d291a8ab
+U danielk1977
+Z 3148119d5b8a2206c0e723ccd87c91b1

diff --git a/manifest.uuid b/manifest.uuid
index 11bd6b0a9100a142a734a162b97c311679ac83ad..38a93cdbda9a2da4c08e445e1f75ee2f0418cd73 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-618df68b8b78d376d30cea79a273fd39140f5033
\ No newline at end of file
+b266924b8975b69bdb9ab45cf462e41436f89cc2
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 649e846b936e22efac294dcf7bd1d5e4700e33a3..11a8cf9c39e7180393e1653008dd043e2275e300 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements in SQLite.
 **
-** $Id: select.c,v 1.422 2008/03/27 17:59:02 danielk1977 Exp $
+** $Id: select.c,v 1.423 2008/03/31 17:41:18 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -205,12 +205,30 @@ static void setToken(Token *p, const char *z){
 **    {a"bc}  ->  {"a""bc"}
 */
 static void setQuotedToken(Parse *pParse, Token *p, const char *z){
-  p->z = (u8 *)sqlite3MPrintf(0, "\"%w\"", z);
-  p->dyn = 1;
-  if( p->z ){
-    p->n = strlen((char *)p->z);
+
+  /* Check if the string contains any " characters. If it does, then
+  ** this function will malloc space to create a quoted version of
+  ** the string in. Otherwise, save a call to sqlite3MPrintf() by
+  ** just copying the pointer to the string.
+  */
+  const char *z2 = z;
+  while( *z2 ){
+    if( *z2=='"' ) break;
+    z2++;
+  }
+
+  if( *z2 ){
+    /* String contains " characters - copy and quote the string. */
+    p->z = (u8 *)sqlite3MPrintf(pParse->db, "\"%w\"", z);
+    if( p->z ){
+      p->n = strlen((char *)p->z);
+      p->dyn = 1;
+    }
   }else{
-    pParse->db->mallocFailed = 1;
+    /* String contains no " characters - copy the pointer. */
+    p->z = (u8*)z;
+    p->n = (z2 - z);
+    p->dyn = 0;
   }
 }