From: drh <drh@noemail.net>
Date: Thu, 12 Jan 2017 11:50:08 +0000 (+0000)
Subject: Make sure Tcl_AppendResult() always has a NULL-pointer argument at the end.
X-Git-Tag: version-3.17.0~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea8f0a155e64ec6ea300ed5c77a96397e77b0edb;p=thirdparty%2Fsqlite.git

Make sure Tcl_AppendResult() always has a NULL-pointer argument at the end.

FossilOrigin-Name: c07aef6f909fe35de110f0b180dbf5aa4c226af3
---

diff --git a/manifest b/manifest
index 62ade5afe1..7f69b73c9c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sallow\ssome\smulti-row\sUPDATE\sstatements\sto\savoid\sthe\stwo-pass\napproach.
-D 2017-01-11T21:03:53.460
+C Make\ssure\sTcl_AppendResult()\salways\shas\sa\sNULL-pointer\sargument\sat\sthe\send.
+D 2017-01-12T11:50:08.746
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -397,7 +397,7 @@ F src/sqliteInt.h bec6274d8991528bc12d9a34d01fe84bdf6d00d9
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
-F src/tclsqlite.c 205c66b9b81d97978a155caa3ef5be9c4de2b174
+F src/tclsqlite.c 418f5e5e0840425a7e5b33f3600dccd378a57549
 F src/test1.c 8a98191a1da8e100f77cdb5cc716df67d405028d
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
@@ -1544,8 +1544,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f58f75b5a06f88ba97bd1a02bee621c64691c6f8 62257eb53c13d4c7ed128d5d89f6f10d4aff945c
-R a5d3781c66cde36056f7269332c03001
-T +closed 62257eb53c13d4c7ed128d5d89f6f10d4aff945c
-U dan
-Z 8a4ce767e7a0e27eb39847a70d667c24
+P 7ae6104a3e0d1d2cacfe2be732f0220a53908132
+R c90de156797531d5a59462fa9fb70f0d
+U drh
+Z 140d8d1b5e4e9e613293d0d1ce895be9
diff --git a/manifest.uuid b/manifest.uuid
index 5a73a263e8..061e989144 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7ae6104a3e0d1d2cacfe2be732f0220a53908132
\ No newline at end of file
+c07aef6f909fe35de110f0b180dbf5aa4c226af3
\ No newline at end of file
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 1d87c9b331..5b52bf0c91 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -2307,7 +2307,7 @@ static int SQLITE_TCLAPI DbObjCmd(
     }
     in = fopen(zFile, "rb");
     if( in==0 ){
-      Tcl_AppendResult(interp, "Error: cannot open file: ", zFile, NULL);
+      Tcl_AppendResult(interp, "Error: cannot open file: ", zFile, (char*)0);
       sqlite3_finalize(pStmt);
       return TCL_ERROR;
     }
@@ -2536,7 +2536,7 @@ static int SQLITE_TCLAPI DbObjCmd(
       int n = strlen30(z);
       if( n>2 && strncmp(z, "-argcount",n)==0 ){
         if( i==(objc-2) ){
-          Tcl_AppendResult(interp, "option requires an argument: ", z, 0);
+          Tcl_AppendResult(interp, "option requires an argument: ", z,(char*)0);
           return TCL_ERROR;
         }
         if( Tcl_GetIntFromObj(interp, objv[i+1], &nArg) ) return TCL_ERROR;
@@ -2551,7 +2551,7 @@ static int SQLITE_TCLAPI DbObjCmd(
         flags |= SQLITE_DETERMINISTIC;
       }else{
         Tcl_AppendResult(interp, "bad option \"", z,
-            "\": must be -argcount or -deterministic", 0
+            "\": must be -argcount or -deterministic", (char*)0
         );
         return TCL_ERROR;
       }
@@ -3208,7 +3208,7 @@ static int SQLITE_TCLAPI DbObjCmd(
           pObj = Tcl_NewStringObj((char*)sqlite3_value_text(pValue), -1);
           Tcl_SetObjResult(interp, pObj);
         }else{
-          Tcl_AppendResult(interp, sqlite3_errmsg(pDb->db), 0);
+          Tcl_AppendResult(interp, sqlite3_errmsg(pDb->db), (char*)0);
           return TCL_ERROR;
         }
       }