In the CLI, fix a file descriptor leak following OOM and a missing va_end()

call.

FossilOrigin-Name: ec36d15a9e349f4295a9e2215dea0a18e9276e0e4ce2d05021e6b467ab7763bb

diff --git a/manifest b/manifest
index ff805184534cbacb7054ed02a21e84d1f6f63b2e..c44252b604cd515b3bb6813f458cac65cc78c4b4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sunix\sVFS,\sfix\sthe\sheap\sshm\sallocator\s(used\sfor\sunix-excl)\s\nso\sthat\sit\sworks\seven\son\ssystems\swhere\sthe\spage\ssize\sis\slarger\sthan\s32KB.
-D 2018-10-11T02:39:11.173
+C In\sthe\sCLI,\sfix\sa\sfile\sdescriptor\sleak\sfollowing\sOOM\sand\sa\smissing\sva_end()\ncall.
+D 2018-10-11T10:37:24.495
 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 d574c3be644c80cfcca358ee673615bb2f4da36596fd0744f05ab52f7e38cd0e
+F src/shell.c.in fa815984cdb07aad83fa0231ce3de32e7a4d022ab4cbc40f851b1881839b8fed
 F src/sqlite.h.in 4b4c2f2daeeed4412ba9d81bc78092c69831fe6eda4f0ae5bf951da51a8dccec
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 305adca1b5da4a33ce2db5bd236935768e951d5651bfe5560ed55cfcdbce6a63
@@ -1771,7 +1771,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 696e82f7c82d1720756078e73f3b15b4cafc202ec290e66f9095a3246c65a3cb
-R 3dab1e5dfa96bd90e2f41942ffa87100
+P 7fbb083c5cf0948af3624b7538ffa086f77de27a3e84a7039ae7d6574f1a3a54
+R b6834208f7c836cdc5642ce75ee0475c
 U drh
-Z eeb432e953b5483573f56669790dd03f
+Z 331652a34e41515169becdfffb61b371

diff --git a/manifest.uuid b/manifest.uuid
index bc8b8d52ed617b603380ab04232940c21de9a47b..b0332906bdbae1a5841579a8b1b6c7be4c82467c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7fbb083c5cf0948af3624b7538ffa086f77de27a3e84a7039ae7d6574f1a3a54
\ No newline at end of file
+ec36d15a9e349f4295a9e2215dea0a18e9276e0e4ce2d05021e6b467ab7763bb
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index a5ab14383cdb8c7365eaebd0fc5422d2672ee3ae..c1db72ce599425fad102f2954610e249fb696ec1 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3592,7 +3592,7 @@ static char *readFile(const char *zName, int *pnByte){
   nIn = ftell(in);
   rewind(in);
   pBuf = sqlite3_malloc64( nIn+1 );
-  if( pBuf==0 ) return 0;
+  if( pBuf==0 ){ fclose(in); return 0; }
   nRead = fread(pBuf, nIn, 1, in);
   fclose(in);
   if( nRead!=1 ){
@@ -4976,6 +4976,7 @@ static void shellPreparePrintf(
     char *z;
     va_start(ap, zFmt);
     z = sqlite3_vmprintf(zFmt, ap);
+    va_end(ap);
     if( z==0 ){
       *pRc = SQLITE_NOMEM;
     }else{