Fix a bug in tclsqlite.c. (CVS 2199)

FossilOrigin-Name: 50f1e229652610b386745bb39fed45549cc74aa7

diff --git a/manifest b/manifest
index 1761ffe4071c4801b2693d9add5643433a3a8812..6e830c0c635e6e0d2ccc058c48338c93a1dcec3a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\sticket\s#1062:\sCorrectly\shandle\sredundant\sterms\sin\sa\sWHERE\sclause.\s(CVS\s2198)
-D 2005-01-11T18:13:56
+C Fix\sa\sbug\sin\stclsqlite.c.\s(CVS\s2199)
+D 2005-01-12T00:08:25
 F Makefile.in ecf441ac5ca1ccfc8748a8a9537706e69893dfa4
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -64,7 +64,7 @@ F src/shell.c e8f4f486cbf6e60d81173146ac8a6522c930fa51
 F src/sqlite.h.in 0d5e48e506845b74a845c9470e01d3f472b59611
 F src/sqliteInt.h a362fd46ba14f67e8e088d30ecbbe228545c43fe
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
-F src/tclsqlite.c 354d3e4525c7b29c8f50b1a0125d55c63c916fbc
+F src/tclsqlite.c 75a8dc9cd7ac0f41482bd7b96b99d54e62b6e98f
 F src/test1.c d684fb31dccd68434e148bef51d9c0a24b09bdf0
 F src/test2.c b11fa244fff02190707dd0879987c37c75e61fc8
 F src/test3.c a72f20066cccd5a7b9f20b7b78fa9b05b47b3020
@@ -97,7 +97,7 @@ F test/autovacuum_ioerr.test 55ea907df34edb9be78a910a1636c2eb3c17ecc4
 F test/autovacuum_ioerr2.test bf427c86e4daa8638a2eb849bbe1446c234c73d3
 F test/bigfile.test d3744a8821ce9abb8697f2826a3e3d22b719e89f
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
-F test/bind.test b4ed42a21677dd0c0cd0ec671dffd1c39a9277b0
+F test/bind.test 578c6526f9e7298a8993815336d676a12684b0cd
 F test/blob.test fc41fe95bdc10da51f0dee73ce86e75ce1d6eb9d
 F test/btree.test 8aa7424aeec844df990273fe36447e5d7e407261
 F test/btree2.test dbce930b549d5ac883a7d8905c976209ea241db3
@@ -268,7 +268,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl c3b50d3ac31c54be2a1af9b488a89d22f1e6e746
-P 00a352ea79e0e1e855282c54d0e470161215f25e
-R 5fad993d144d0f23ddfb0703fd19bbe3
+P 1bee1bb91d39ff8a33efe662b6cab6dbd2d50e3c
+R 6de97aaefc689d9641defe44416179bf
 U drh
-Z 38a58b2fdff532e903d36a0479086b72
+Z 686cf7812785575d0f1d1fe10b0b7525

diff --git a/manifest.uuid b/manifest.uuid
index 59d7a63be7b1acfe8850ceca0832683f3991b934..d4e23d46b73a8fb2fca8d94473fae9cfce51c7de 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1bee1bb91d39ff8a33efe662b6cab6dbd2d50e3c
\ No newline at end of file
+50f1e229652610b386745bb39fed45549cc74aa7
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 3535bbbf373a177ec80e1131ed9f93d2e265a42c..7561fdc63985ec94b75978ed220e7197203370e3 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.112 2005/01/08 18:42:29 drh Exp $
+** $Id: tclsqlite.c,v 1.113 2005/01/12 00:08:25 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -750,7 +750,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
       }
       for(i=1; i<=nVar; i++){
         const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
-        if( zVar[0]=='$' || zVar[0]==':' ){
+        if( zVar!=0 && (zVar[0]=='$' || zVar[0]==':') ){
           Tcl_Obj *pVar = Tcl_GetVar2Ex(interp, &zVar[1], 0, 0);
           if( pVar ){
             int n;

diff --git a/test/bind.test b/test/bind.test
index 361fff8501d3496fdecf7cb49d71bd892535a171..8bdc7af93e09a94d40dd3574888bbd553df4c8ad 100644 (file)
--- a/test/bind.test
+++ b/test/bind.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the sqlite_bind API.
 #
-# $Id: bind.test,v 1.25 2005/01/11 17:46:42 drh Exp $
+# $Id: bind.test,v 1.26 2005/01/12 00:08:25 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -498,5 +498,4 @@ do_test bind-11.1 {
   catchsql {SELECT * FROM sqlite_master WHERE name=$abc(123 and sql NOT NULL;}
 } {1 {unrecognized token: "$abc(123"}}
 
-
 finish_test