Fix a bug in the command-line shell logic that attempts to continue with a

".dump" even after encountering database corruption.

FossilOrigin-Name: 020b5e90f950a42299074ff770612b9e68850d95

diff --git a/manifest b/manifest
index c13f55ba33a7a48d4f90f60fd0ebf32aa4a6902b..dd970aa6371b84e7d5c6dc710228ef61baee787d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sunix\sVFS,\salways\sset\severy\sopen\sfile\sto\sclose-on-exec\susing\seither\nO_CLOEXEC\sat\sopen\s(preferred)\sor\sFD_CLOEXEC\sin\san\sioctl\safter\sopening.\s\sBefore\nthis\schanges,\smany\sfiles\swere\sdone\sthis\sway,\sbut\snot\sall.
-D 2012-04-14T13:25:11.842
+C Fix\sa\sbug\sin\sthe\scommand-line\sshell\slogic\sthat\sattempts\sto\scontinue\swith\sa\n".dump"\seven\safter\sencountering\sdatabase\scorruption.
+D 2012-04-16T17:22:30.904
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -182,7 +182,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 969ec2bc52db1b068054ecf5ddc74f244102a71d
 F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
 F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
-F src/shell.c 6fef5d2cd1eccd0a692d5d458897d815afaea908
+F src/shell.c 5d2484bea27d1fb8a733077c436482a06c1d30f2
 F src/sqlite.h.in 4338f299fc83dada8407358d585c0e240ecb76a3
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 F src/sqliteInt.h ce7d8404f15db6cbe73cf196d3d6198aaa4e3924
@@ -1000,7 +1000,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P e87371c5081ce28431a4c7ceaa81ff966a378c66
-R 7b4651c870902ae8ed7532d13f371f85
+P 9efbeb11ae0d480a13ff1353820c12f3a8bff452
+R 8554990f6e5abd69d8539d60c8a20e9c
 U drh
-Z 1af9fe4892fd87b77f8c0791d9bcac7c
+Z 6fed7a84ff8fa569c38ca78c5c084864

diff --git a/manifest.uuid b/manifest.uuid
index 33206a76f033adbd602a57542904a1417bbdaac4..09a6bb90fb01426f654af1158bdd0d1ba5a46fe4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9efbeb11ae0d480a13ff1353820c12f3a8bff452
\ No newline at end of file
+020b5e90f950a42299074ff770612b9e68850d95
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index e5cfec70a8b0d72b97754aa5181704e4235dff09..b4c21ad38b9aa139bdf424df237284872063f56e 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1369,7 +1369,7 @@ static int run_schema_dump_query(
     }
     zQ2 = malloc( len+100 );
     if( zQ2==0 ) return rc;
-    sqlite3_snprintf(sizeof(zQ2), zQ2, "%s ORDER BY rowid DESC", zQuery);
+    sqlite3_snprintf(len+100, zQ2, "%s ORDER BY rowid DESC", zQuery);
     rc = sqlite3_exec(p->db, zQ2, dump_callback, p, &zErr);
     if( rc ){
       fprintf(p->out, "/****** ERROR: %s ******/\n", zErr);