New assert()s added to verify that the Expr.token value is used correctly. Ticket...

FossilOrigin-Name: cf3d84ab73b7f519921a984f88bdad81996a3a82

diff --git a/manifest b/manifest
index 30de5671726ffc29a520275ab79816e2f9e625c9..705b330d4feb5b0256daa05a1e4d2b421108bdec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sinsure\sthat\slookaside\smemory\sallocations\sare\snever\sused\sto\shold\r\nschema\scontent.\r\nTicket\s#3743.\s(CVS\s6377)
-D 2009-03-24T15:08:10
+C New\sassert()s\sadded\sto\sverify\sthat\sthe\sExpr.token\svalue\sis\sused\scorrectly.\s\sTicket\s#3743.\s(CVS\s6378)
+D 2009-03-24T15:31:28
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -111,7 +111,7 @@ F src/callback.c 73016376d6848ba987709e8c9048d4f0e0776036
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
 F src/date.c 0d804df3bbda46329946a01ff5c75c3f4f135218
 F src/delete.c eb1066b2f35489fee46ad765d2b66386fc7d8adf
-F src/expr.c 614a60615fd4bd186459c0c1fa87fdefedb76c26
+F src/expr.c f30a43302c4c9c513dc8013426f26f6f7925d2e5
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
 F src/func.c de2eed7d96365210faecda877c5a12cf440bdf42
 F src/global.c 448419c44ce0701104c2121b0e06919b44514c0c
@@ -159,7 +159,7 @@ F src/select.c 607e5b2d3be379781e5be3ac0854f5c237152d26
 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
 F src/sqlite.h.in 0db1e59d89aeacb8fe64a19fd14c13a796060ccb
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h ddaadadd35b07e468b0a07a5575c796a71e89dc1
+F src/sqliteInt.h 5ed5b45d9f23f2fa57c957cce76086552bcaa002
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 332ab0ea691e63862e2a8bdfe2c0617ee61062a3
@@ -709,7 +709,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 8ca6a665650c9683a202f3ced17b14f7c85624bf
-R 8c93b31b69e1e1ff0ee86ef0261f4c0c
+P ea74d8dc62f5784089aa8ef098e97c505a79b176
+R ab87e9de54efb8f849d3abff807164cc
 U drh
-Z 226c5008143d3b67d9a3ebdf1903227a
+Z f9ee8e93eecc28dfc86631eac2acdccf

diff --git a/manifest.uuid b/manifest.uuid
index fba0d0c964080b1318f8ec7fc29d438246e3f1dd..41d4c518c43e28c00d7d619bd61e947ba1de2417 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea74d8dc62f5784089aa8ef098e97c505a79b176
\ No newline at end of file
+cf3d84ab73b7f519921a984f88bdad81996a3a82
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 01e151e831f5dca90590248d9b6c469a481b3682..685b599f486a7c9d8dfa7ab40d8d623d64e389e6 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.422 2009/03/24 15:08:10 drh Exp $
+** $Id: expr.c,v 1.423 2009/03/24 15:31:28 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -408,17 +408,19 @@ Expr *sqlite3Expr(
     assert( pToken->dyn==0 );
     pNew->span = *pToken;
  
-    /* The pToken->z value is constant and must not change.  But
-    ** this expression might be passed to sqlite3DequoteExpr() which
+    /* The pToken->z value is read-only.  But the new expression
+    ** node created here might be passed to sqlite3DequoteExpr() which
     ** will attempt to modify pNew->token.z.  Hence, if the token
     ** is quoted, make a copy now so that DequoteExpr() will change
-    ** the copy rather than the original (read-only) text.
+    ** the copy rather than the original text.
     */
     if( pToken->n>=2 
          && ((c = pToken->z[0])=='\'' || c=='"' || c=='[' || c=='`') ){
       sqlite3TokenCopy(db, &pNew->token, pToken);
     }else{
       pNew->token = *pToken;
+      pNew->flags |= EP_Dequoted;
+      VVA_ONLY( pNew->vvaFlags |= EVVA_ReadOnlyToken; )
     }
   }else if( pLeft ){
     if( pRight ){
@@ -660,6 +662,7 @@ void sqlite3ExprDelete(sqlite3 *db, Expr *p){
 void sqlite3DequoteExpr(sqlite3 *db, Expr *p){
   if( !ExprHasAnyProperty(p, EP_Dequoted) ){
     ExprSetProperty(p, EP_Dequoted);
+    assert( (p->vvaFlags & EVVA_ReadOnlyToken)==0 );
     sqlite3Dequote((char*)p->token.z);
   }
 }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index bb79aaa7c2dec14cfb0d4bb56d39622dd4a58425..781040bbd6c21dbd9239e3276448b2229dff96dc 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.846 2009/03/24 15:08:10 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.847 2009/03/24 15:31:28 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1458,7 +1458,8 @@ struct AggInfo {
 struct Expr {
   u8 op;                 /* Operation performed by this node */
   char affinity;         /* The affinity of the column or 0 if not a column */
-  u16 flags;             /* Various flags.  See below */
+  VVA_ONLY(u8 vvaFlags;) /* Flags used for VV&A only.  EVVA_* below. */
+  u16 flags;             /* Various flags.  EP_* See below */
   Token token;           /* An operand token */
 
   /* If the EP_TokenOnly flag is set in the Expr.flags mask, then no
@@ -1518,6 +1519,15 @@ struct Expr {
 #define EP_TokenOnly  0x4000  /* Expr struct is EXPR_TOKENONLYSIZE bytes only */
 #define EP_SpanOnly   0x8000  /* Expr struct is EXPR_SPANONLYSIZE bytes only */
 
+/*
+** The following are the meanings of bits in the Expr.vvaFlags field.
+** This information is only used when SQLite is compiled with
+** SQLITE_DEBUG defined.
+*/
+#ifndef NDEBUG
+#define EVVA_ReadOnlyToken  0x01  /* Expr.token.z is read-only */
+#endif
+
 /*
 ** These macros can be used to test, set, or clear bits in the 
 ** Expr.flags field.