From: dan <dan@noemail.net>
Date: Fri, 15 May 2020 18:48:31 +0000 (+0000)
Subject: Update code in sqlite3expert.c to account for the fact that "-- TRIGGER xyz" VM comme... 
X-Git-Tag: version-3.32.0~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2c6fe225ae5467478658a5dc32fe50b063f7419;p=thirdparty%2Fsqlite.git

Update code in sqlite3expert.c to account for the fact that "-- TRIGGER xyz" VM comments are now omitted for some builds.

FossilOrigin-Name: 7cf93dc55c48c68731a1fe3ae3517fcfeb5c252bfa87e715a333c6194bcc0ace
---

diff --git a/ext/expert/sqlite3expert.c b/ext/expert/sqlite3expert.c
index 72c6024552..0685e54222 100644
--- a/ext/expert/sqlite3expert.c
+++ b/ext/expert/sqlite3expert.c
@@ -1128,9 +1128,12 @@ int idxFindIndexes(
       /* int iParent = sqlite3_column_int(pExplain, 1); */
       /* int iNotUsed = sqlite3_column_int(pExplain, 2); */
       const char *zDetail = (const char*)sqlite3_column_text(pExplain, 3);
-      int nDetail = STRLEN(zDetail);
+      int nDetail;
       int i;
 
+      if( !zDetail ) continue;
+      nDetail = STRLEN(zDetail);
+
       for(i=0; i<nDetail; i++){
         const char *zIdx = 0;
         if( memcmp(&zDetail[i], " USING INDEX ", 13)==0 ){
diff --git a/manifest b/manifest
index 3575c8348f..792bffec3f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\sbuild\sproblem\sfor\sSQLITE_OMIT_VIRTUALTABLE\sbuilds.
-D 2020-05-15T16:19:35.484
+C Update\scode\sin\ssqlite3expert.c\sto\saccount\sfor\sthe\sfact\sthat\s"--\sTRIGGER\sxyz"\sVM\scomments\sare\snow\somitted\sfor\ssome\sbuilds.
+D 2020-05-15T18:48:31.264
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -49,7 +49,7 @@ F ext/async/sqlite3async.h f489b080af7e72aec0e1ee6f1d98ab6cf2e4dcef
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
 F ext/expert/expert1.test 2e10ff875c31c9e6fc5e324767624181273859771fe34c5daeeadf3f2974a4f7
-F ext/expert/sqlite3expert.c fbcf97d9d0286ec8b1909308ff53b573a8aedb80e7ef13033f0dc66c146902de
+F ext/expert/sqlite3expert.c 6e59d97334648edd83ffa57b1dff92063022eb173cb7c8107fa9c76550ce2936
 F ext/expert/sqlite3expert.h ca81efc2679a92373a13a3e76a6138d0310e32be53d6c3bfaedabd158ea8969b
 F ext/expert/test_expert.c d56c194b769bdc90cf829a14c9ecbc1edca9c850b837a4d0b13be14095c32a72
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
@@ -1866,7 +1866,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 758353c72627a847ba027ca44a750bbf057827dafd05811f56e4765dfc77623b
-R 10897399024bb26c2d342206bd761968
+P 5e1eb0fa3afd74251bc8f484e3edfa81b15610479431af205bd952c91eecd21f
+R 0e397fa4d97a0dd7081692cb693410ed
 U dan
-Z ae18daba7855167da6d0a790a481b18b
+Z 81fc3648557f632403998e24e4aa1d05
diff --git a/manifest.uuid b/manifest.uuid
index 1fe05e52c1..4581705e33 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5e1eb0fa3afd74251bc8f484e3edfa81b15610479431af205bd952c91eecd21f
\ No newline at end of file
+7cf93dc55c48c68731a1fe3ae3517fcfeb5c252bfa87e715a333c6194bcc0ace
\ No newline at end of file