From: drh <>
Date: Sat, 25 Jun 2022 02:39:29 +0000 (+0000)
Subject: Change a harmless assert() into a testcase().  The actually test case code
X-Git-Tag: version-3.39.0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a36fedbda0bc948c65c915c11618018d35e4e266;p=thirdparty%2Fsqlite.git

Change a harmless assert() into a testcase().  The actually test case code
is in TH3.  Fix for the problem described at
[forum:/info/ed29e196d5c4f3d5|forum post ed29e196d5c4f3d5].

FossilOrigin-Name: cd6254fcd32798f7be4e6d827597ddaa2e46ac6e2f0149cd3a3be0416fa18835
---

diff --git a/manifest b/manifest
index 621dd03662..05a024af6a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\sUBSAN\swarning\sassociated\swith\sPRAGMA\sschema_version\nfound\sby\sOSSFuzz.
-D 2022-06-24T12:56:48.588
+C Change\sa\sharmless\sassert()\sinto\sa\stestcase().\s\sThe\sactually\stest\scase\scode\nis\sin\sTH3.\s\sFix\sfor\sthe\sproblem\sdescribed\sat\n[forum:/info/ed29e196d5c4f3d5|forum\spost\sed29e196d5c4f3d5].
+D 2022-06-25T02:39:29.691
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -648,7 +648,7 @@ F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
 F src/vdbeapi.c 602610f1252d59cd69742f78a1e2f6fbae40a4b407f5506a6a7b869b0df08ff2
 F src/vdbeaux.c 328b866880e67526300aa2361c5e50beb3d97dd8746db37dd4aa0135aea60e4d
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c 3db315458f8dc158aff58719795441437dd6c0fd302e9d9379a8f2a61e185ad6
+F src/vdbemem.c 5ebf05c0182addedb1607ade848e1c83cef40981df94d1abfab0c59288c6064f
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@ -1978,8 +1978,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P db5266dec601a9513bc8dd09a9f8bb4aef55b780d22610946099e8edd4836587
-R 09efcead2b1be4144ef279312bf3e194
+P e93fd170ce4ae91d572c46d03f68f55d00091d0188030517455017d90d212587
+R 4b3e64a86ee9acaa4f97f1ab6ad6f3ae
 U drh
-Z 1fc91f4cca35906afdee86eebc313610
+Z a035a0d8785c9fade2643e05717ac0f6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1a1f800066..893d433b53 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e93fd170ce4ae91d572c46d03f68f55d00091d0188030517455017d90d212587
\ No newline at end of file
+cd6254fcd32798f7be4e6d827597ddaa2e46ac6e2f0149cd3a3be0416fa18835
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index aaae2f49ff..fd4ab0ccc6 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1491,7 +1491,8 @@ static int valueFromFunction(
     goto value_from_function_out;
   }
 
-  assert( pCtx->pParse->rc==SQLITE_OK );
+  testcase( pCtx->pParse->rc==SQLITE_ERROR );
+  testcase( pCtx->pParse->rc==SQLITE_OK );
   memset(&ctx, 0, sizeof(ctx));
   ctx.pOut = pVal;
   ctx.pFunc = pFunc;