From: drh <drh@noemail.net>
Date: Thu, 2 Apr 2020 17:21:51 +0000 (+0000)
Subject: Minor changes for better test coverage.
X-Git-Tag: version-3.32.0~50^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1cd73f671d55d3f59f93e4949aba54de7f9bf66;p=thirdparty%2Fsqlite.git

Minor changes for better test coverage.

FossilOrigin-Name: ae3ac297d2deee2a687ae2e9cf98aaf3e1b41196363238101a19d38092aebec6
---

diff --git a/manifest b/manifest
index 691abd35eb..d1c569a624 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\sharmless\scompiler\swarning.
-D 2020-04-02T13:08:54.300
+C Minor\schanges\sfor\sbetter\stest\scoverage.
+D 2020-04-02T17:21:51.663
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -607,7 +607,7 @@ F src/vdbe.c 972999395eee88702091fb5d50cf4effd07889c371807d222a7f517388e6378e
 F src/vdbe.h 07b8c636a87df8b6e58f29d6badd7f10d5844353deff1d7c88ed1c2bfe3bbd35
 F src/vdbeInt.h 571413068b5ac07e2ed8ca7a02fa529622fd5455ae6981498376e5e492d2e5ef
 F src/vdbeapi.c d176ee7251d5344de7bb2a0d2dd0fe536834e5843d9bc2389e0f5cdcd5374141
-F src/vdbeaux.c 2b47d2443f2bf6a26cac0872b39d0642a8b7ff86c207eea0aed37d39a7d379d7
+F src/vdbeaux.c 5ed714712eed5cba379ec6d0fd26069565d57f4970722bfd9537b10845dc8091
 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 F src/vdbemem.c 39b942ecca179f4f30a32b54579a85d74ccaefa5af2a0ad2700abe5ef0768b22
 F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
@@ -1861,7 +1861,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 cc54de354317ebc080d4d1ee25427b31a49c4a75e01cb5d9966f1aaeb2ad098d
-R 8fe319a58a23143f83b349fa4edfbc9a
+P 949eec2530bbe7f48daddfb3022d60ea5d7a43f0f5d120e71c682054feb721db
+R f1c38c95159bd2ae4b930179bb0c81bb
 U drh
-Z 7487d39d42c11bfb0d43c4ac88cff31d
+Z 7c6fe0eb276ad7b15d9155e78411c897
diff --git a/manifest.uuid b/manifest.uuid
index bd924a15f5..1e412e5c71 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-949eec2530bbe7f48daddfb3022d60ea5d7a43f0f5d120e71c682054feb721db
\ No newline at end of file
+ae3ac297d2deee2a687ae2e9cf98aaf3e1b41196363238101a19d38092aebec6
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 7806b2ad66..2642c59b81 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1717,9 +1717,8 @@ char *sqlite3VdbeDisplayP4(sqlite3 *db, Op *pOp){
       int n = ai[0];   /* The first element of an INTARRAY is always the
                        ** count of the number of elements to follow */
       for(i=1; i<=n; i++){
-        sqlite3_str_appendf(&x, ",%d", ai[i]);
+        sqlite3_str_appendf(&x, "%c%d", (i==1 ? '[' : ','), ai[i]);
       }
-      if( !x.accError ) x.zText[0] = '[';
       sqlite3_str_append(&x, "]", 1);
       break;
     }
@@ -1740,7 +1739,7 @@ char *sqlite3VdbeDisplayP4(sqlite3 *db, Op *pOp){
     }
   }
   if( zP4 ) sqlite3_str_appendall(&x, zP4);
-  if( (x.accError & SQLITE_NOMEM)!=0 && db!=0 ){
+  if( (x.accError & SQLITE_NOMEM)!=0 ){
     sqlite3OomFault(db);
   }
   return sqlite3StrAccumFinish(&x);
@@ -1834,9 +1833,11 @@ void sqlite3VdbeLeave(Vdbe *p){
 void sqlite3VdbePrintOp(FILE *pOut, int pc, VdbeOp *pOp){
   char *zP4;
   char *zCom;
+  sqlite3 dummyDb;
   static const char *zFormat1 = "%4d %-13s %4d %4d %4d %-13s %.2X %s\n";
   if( pOut==0 ) pOut = stdout;
-  zP4 = sqlite3VdbeDisplayP4(0, pOp);
+  dummyDb.mallocFailed = 1;
+  zP4 = sqlite3VdbeDisplayP4(&dummyDb, pOp);
 #ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
   zCom = sqlite3VdbeDisplayComment(0, pOp, zP4);
 #else