From: dan <dan@noemail.net>
Date: Mon, 7 Oct 2019 13:46:43 +0000 (+0000)
Subject: Add a test case for the assert() fix in the previous commit.
X-Git-Tag: version-3.31.0~429
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8451e1fa27815a1f63ad90aca751469db120973f;p=thirdparty%2Fsqlite.git

Add a test case for the assert() fix in the previous commit.

FossilOrigin-Name: 32fba11ab72f6300391267eaad64e92fa767c289029e668e4bd6c9165acf1487
---

diff --git a/manifest b/manifest
index 43bb0be000..60da30f028 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sfaulty\sassert()\sstatement\sin\sthe\ssqlite3VdbeMemExpandBlob()\sroutine.
-D 2019-10-07T13:26:58.759
+C Add\sa\stest\scase\sfor\sthe\sassert()\sfix\sin\sthe\sprevious\scommit.
+D 2019-10-07T13:46:43.787
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -769,7 +769,7 @@ F test/corruptH.test 79801d97ec5c2f9f3c87739aa1ec2eb786f96454
 F test/corruptI.test a17bbf54fdde78d43cf3cc34b0057719fd4a173a3d824285b67dc5257c064c7b
 F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
 F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af
-F test/corruptL.test dfad96373bf9264d73039315ea6013994b90bf6776847adc7ec06b6fad3c04b2
+F test/corruptL.test a22a7bbf8da7603960f0bfcc62a68d1c3c41963786bd832ff804ba5e2458fb9c
 F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067
 F test/cost.test 51f4fcaae6e78ad5a57096831259ed6c760e2ac6876836e91c00030fad385b34
 F test/count.test cb2e0f934c6eb33670044520748d2ecccd46259c
@@ -1846,7 +1846,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 3cde82c86b963fa75192907d548febd3882c7d8fc7daf1903fadd5ca46623be1
-R 73df9511ada20723ed01dfaf44dc9280
-U drh
-Z 8b3be29b1e469069a86d0b588261ad50
+P 69a26eade2f92029e722a5a654214b1e2a3fc7ed497ce9aa5a7dce944f90e502
+R fc0a42027c5e123c7e9c334ffeb0817d
+U dan
+Z 3aa98325281de1e7b28033dd15b881b8
diff --git a/manifest.uuid b/manifest.uuid
index c676d3fa32..87a31bf44a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-69a26eade2f92029e722a5a654214b1e2a3fc7ed497ce9aa5a7dce944f90e502
\ No newline at end of file
+32fba11ab72f6300391267eaad64e92fa767c289029e668e4bd6c9165acf1487
\ No newline at end of file
diff --git a/test/corruptL.test b/test/corruptL.test
index b0ad66db44..58fa7bc4eb 100644
--- a/test/corruptL.test
+++ b/test/corruptL.test
@@ -1071,4 +1071,43 @@ do_catchsql_test 11.1 {
   DELETE FROM t3 WHERE x IN (SELECT x FROM t4);
 } {1 {database disk image is malformed}}
 
+#-------------------------------------------------------------------------
+reset_db
+do_test 12.0 {
+  sqlite3 db {}
+  db deserialize [decode_hexdb {
+| size 12288 pagesize 4096 filename crash-e6d070858a3a85.db
+| page 1 offset 0
+|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
+|     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 00   .....@  ........
+|     96: 00 00 00 00 0d 00 00 00 02 0f 8f 00 0f bf 0f 8f   ................
+|   3968: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2e   ................
+|   3984: 02 06 17 15 11 01 45 69 6e 64 65 78 74 31 63 62   ......Eindext1cb
+|   4000: 74 31 03 43 52 45 41 54 45 20 49 4e 44 45 58 20   t1.CREATE INDEX 
+|   4016: 74 31 63 62 20 4f 4e 20 74 31 28 63 2c 62 29 3f   t1cb ON t1(c,b)?
+|   4032: 01 06 17 11 11 01 6b 74 61 62 6c 65 74 31 74 31   ......ktablet1t1
+|   4048: 02 43 52 45 41 54 45 20 54 41 42 4c 45 20 74 31   .CREATE TABLE t1
+|   4064: 28 61 20 49 4e 54 2c 20 62 20 49 4e 54 2c 20 43   (a INT, b INT, C
+|   4080: 20 49 4e 54 20 44 45 46 41 55 4c 54 20 31 36 29    INT DEFAULT 16)
+| page 2 offset 4096
+|      0: 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+|   4000: 00 00 00 00 00 00 00 00 07 0b 04 01 01 01 63 63   ..............cc
+|   4016: 11 05 0a 04 00 00 01 11 05 09 04 08 08 01 0f 05   ................
+|   4032: 08 04 00 00 01 01 56 07 04 01 08 01 07 10 07 06   ......V.........
+|   4048: 14 01 01 01 06 08 10 06 05 04 f5 00 01 05 10 07   ................
+|   4064: 04 04 01 01 01 04 03 10 06 03 04 01 09 01 03 10   ................
+|   4080: 06 02 04 01 00 01 02 10 06 01 04 09 01 01 02 10   ................
+| page 3 offset 8192
+|      0: 0a 00 00 00 0b 0f b0 00 0f f9 0f f2 0f eb 0f e4   ................
+|     16: 0f dd 0f d6 0f 9f 0f c7 0f be 00 00 00 00 00 00   ................
+|   4016: 07 04 01 01 01 11 e2 0b 06 04 91 00 01 11 0a 07   ................
+|   4032: 04 01 01 01 10 08 06 07 04 01 01 01 10 04 04 06   ................
+|   4048: 04 01 01 09 10 02 06 04 01 0a 01 10 00 00 00 00   ................
+| end crash-e6d070858a3a85.db
+}]} {}
+
+do_catchsql_test 12.1 {
+  SELECT CAST((SELECT b FROM t1 WHERE 16=c) AS int) FROM t1 WHERE 16=c;
+} {1 {database disk image is malformed}}
+
 finish_test