From: drh <drh@noemail.net>
Date: Tue, 4 Feb 2020 00:55:27 +0000 (+0000)
Subject: Fix a problem with the byte-code decompiler that was inserted by the
X-Git-Tag: version-3.32.0~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40d1db8d20ed664abd7303f9ed1cd15f437ddd54;p=thirdparty%2Fsqlite.git

Fix a problem with the byte-code decompiler that was inserted by the
enhancements at [4248980a356f659b]

FossilOrigin-Name: af63e95dcdd6e9741cdddc3698e857e3b8be40048d3036f939f3583e517c4eff
---

diff --git a/manifest b/manifest
index db6e0fcc08..e896cf4ef0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cosmetic\schange\sto\sthe\sxfer-optimization\sto\sput\sthe\sOP_RowData\sopcode\scloser\nto\sthe\scorresponding\sOP_Insert\sopcode.\s\sThis\smakes\sit\sslightly\seasier\sto\sread\nand\sunderstand\sthe\scode.
-D 2020-02-03T19:56:51.827
+C Fix\sa\sproblem\swith\sthe\sbyte-code\sdecompiler\sthat\swas\sinserted\sby\sthe\nenhancements\sat\s[4248980a356f659b]
+D 2020-02-04T00:55:27.137
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -607,7 +607,7 @@ F src/vdbe.c b34d430a44ebb9f4ccdaf590de641b8ef126480a64f1544b11146a5d8b672879
 F src/vdbe.h defd693289c7bb8d325f109be9490c77138061211a116827da7244b6015a4934
 F src/vdbeInt.h 30d3e8b991547cdf39025e416a0a737b0416d46747af70ae058f60e2e0466fe7
 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
-F src/vdbeaux.c 72a47b6beca06811144ddf370e2327fc9628243eab69f09cc5ace4d19b39e208
+F src/vdbeaux.c 873d96bc4c046a016b3a35c736a45f26a31b59b1480a0cdd79e40f02c9bd001c
 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 F src/vdbemem.c 6200af702c87105d5b00d8ac5f5fa2c6d8f796aa974dbe2d15dcd95379ba1fa7
 F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
@@ -1858,7 +1858,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 8130bbb4217bd4a4db1f6bf97115a60bee8b29943bed0c7bdf54bba5edbed8fc
-R 15f176b48a8876aca49125fa65471b85
+P 0ea2dbfc9088561d62c3456803cb08d357e4e60f1d21f6ed37315564be4957d3
+R a14cfc41ee4ece6f232257046b936365
 U drh
-Z 9fbc5938f8c128c6355e34388855d5f0
+Z 5e1934dfa02991667f95c2767a706795
diff --git a/manifest.uuid b/manifest.uuid
index eef6c82407..90f781006f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ea2dbfc9088561d62c3456803cb08d357e4e60f1d21f6ed37315564be4957d3
\ No newline at end of file
+af63e95dcdd6e9741cdddc3698e857e3b8be40048d3036f939f3583e517c4eff
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 5538af8da7..69b6216c06 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1489,8 +1489,7 @@ static int displayComment(
             }
           }else if( strncmp(zSynopsis+ii+1, "@NP", 3)==0 ){
             sqlite3_context *pCtx = pOp->p4.pCtx;
-            assert( pOp->p4type==P4_FUNCCTX );
-            if( pCtx->argc==1 ){
+            if( pOp->p4type!=P4_FUNCCTX || pCtx->argc==1 ){
               sqlite3_str_appendf(&x, "%d", v1);
             }else if( pCtx->argc>1 ){
               sqlite3_str_appendf(&x, "%d..%d", v1, v1+pCtx->argc-1);