Fix a total unimportant file descriptor leak in lemon. This is to silence

warning messages.

FossilOrigin-Name: e95cf2c576dda656c0f31eeec3d98e911b9003a1

diff --git a/manifest b/manifest
index b5a9fe675f2cc397f309ec1ed109d0a523a3f696..fc14f9ba216c51668be04a41c520f47d3d6235b7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbuffer\soverrun\sin\stest\slogic.\s\sNo\simpact\son\sthe\score\sSQLite.
-D 2011-08-30T00:53:50.943
+C Fix\sa\stotal\sunimportant\sfile\sdescriptor\sleak\sin\slemon.\s\sThis\sis\sto\ssilence\nwarning\smessages.
+D 2011-08-30T00:58:58.556
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -927,7 +927,7 @@ F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
-F tool/lemon.c d51c68d405ff7f9bad99268ca3c20a198eb983ed
+F tool/lemon.c 949328f67cac94969d3112b105b8457edf27f44e
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@ -961,7 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P ad78ef2b3a20e3c3191fba232cbae70656210cf5
-R 9fd102bca587a254d41deef9450d4a29
+P 49cd60e38bd8df9d736ced95e0ace6efea95ca7d
+R 864960f9c27e1685a9edda4031c320e3
 U drh
-Z 9655fc5ee46b247cbd13810f6ee3dd0d
+Z 0c80443f2de345db03862d58a6ec74c5

diff --git a/manifest.uuid b/manifest.uuid
index 13a9ce5ab51e2e0d3ebfb8b2ff4dbd2d397be474..72809be723b7fa803625070c922ab9d511ac043f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-49cd60e38bd8df9d736ced95e0ace6efea95ca7d
\ No newline at end of file
+e95cf2c576dda656c0f31eeec3d98e911b9003a1
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index bd2938be258dad5017fc6dfd9b83dd9e86a9c1b4..1fb0308bec6db2473879eb4da96b84366e19c22f 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -2522,6 +2522,7 @@ void Parse(struct lemon *gp)
     ErrorMsg(ps.filename,0,"Can't allocate %d of memory to hold this file.",
       filesize+1);
     gp->errorcnt++;
+    fclose(fp);
     return;
   }
   if( fread(filebuf,1,filesize,fp)!=filesize ){
@@ -2529,6 +2530,7 @@ void Parse(struct lemon *gp)
       filesize);
     free(filebuf);
     gp->errorcnt++;
+    fclose(fp);
     return;
   }
   fclose(fp);