Change a type in shell.c.in from "int" to "sqlite3_int64" in order to

avoid a compiler warning and possible integer overflow.

FossilOrigin-Name: bf0a6634cd8f9457992b8da522a6775a304156815bf6f4f64f96016356baa870

diff --git a/manifest b/manifest
index 7bc0eac532178547530b05d59b7eb0b24907ffba..0534072120634be193b74df0d2ceecc249f98626 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sadditional\sassert()\sverifying\smutex\sinvariants\son\sthe\nunixShmSystemLock()\sroutine\sin\sthe\sunix\sVFS.
-D 2018-10-02T20:16:41.170
+C Change\sa\stype\sin\sshell.c.in\sfrom\s"int"\sto\s"sqlite3_int64"\sin\sorder\sto\navoid\sa\scompiler\swarning\sand\spossible\sinteger\soverflow.
+D 2018-10-03T11:13:30.633
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -504,7 +504,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bc8c79e56439b111e7d9415e44940951f7087e9466c3a9d664558ef0faf31073
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 33aacf1c17c64a00788c779b23d0875dd0d90eb4c08f867ebc31139ef3a67c95
-F src/shell.c.in 2162b1dc99b806298207c9c202aa7b49ac8553b8b1e73bb28cd80d5a1861df39
+F src/shell.c.in 6046da2a92998b8fe004ed4eadd4d7f53d6a8e4d99e5e25a0cc7de6de5f6b26b
 F src/sqlite.h.in 4b4c2f2daeeed4412ba9d81bc78092c69831fe6eda4f0ae5bf951da51a8dccec
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 305adca1b5da4a33ce2db5bd236935768e951d5651bfe5560ed55cfcdbce6a63
@@ -1770,7 +1770,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 9280774a4bbc665d70f346d258768cbcca3e0e77791473aecfd7d0e87810ab31
-R fbea89096e881563b5cf5b6d1bddc038
-U drh
-Z 844839c6466e9a3eaf0ac358bf4608fd
+P cb1511065d5348c5b3015dc9d690fc5d519a14ffdfa7164bb552a4fa686ad142
+R 4113007e1d90a93b8509333dc142f43c
+U dan
+Z 95fcad407c511808d2b753b90ec6a6c6

diff --git a/manifest.uuid b/manifest.uuid
index 25b0dcf9ab58ef9a95cddea8520957c373e8b77d..6271e5249c99b92c66e6a764789343705d2d13b8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb1511065d5348c5b3015dc9d690fc5d519a14ffdfa7164bb552a4fa686ad142
\ No newline at end of file
+bf0a6634cd8f9457992b8da522a6775a304156815bf6f4f64f96016356baa870
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 9bfc3d12cfcc74e540b3847de2f282f57b60f1c7..cc375e820c1ea3bf2261978c18df046bc5160aea 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1273,7 +1273,7 @@ static void editFunc(
   if( bBin ){
     sqlite3_result_blob64(context, p, sz, sqlite3_free);
   }else{
-    int i, j;
+    sqlite3_int64 i, j;
     if( hasCRNL ){
       /* If the original contains \r\n then do no conversions back to \n */
       j = sz;