From: drh <drh@noemail.net>
Date: Wed, 16 Oct 2013 11:31:51 +0000 (+0000)
Subject: Fix memory and resource leaks for WinCE and Cygwin, and a compiler warning
X-Git-Tag: version-3.8.1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0353ed21365210a3149107445b22dcf6623fee16;p=thirdparty%2Fsqlite.git

Fix memory and resource leaks for WinCE and Cygwin, and a compiler warning
on windows with SQLITE_THREADSAFE=0.

FossilOrigin-Name: 9905cea9d45c90f2241f56dc32a25501476983bc
---

0353ed21365210a3149107445b22dcf6623fee16
diff --cc manifest
index 1cb1c24283,882a754335..10e48ebeee
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\s"languageid"\shidden\scolumn\sto\sfts4aux.
- D 2013-10-15T19:06:17.574
 -C Fix\smemory/resource\sleaks\sfor\sWinCE\sand\sCygwin.
 -D 2013-10-16T09:49:10.719
++C Fix\smemory\sand\sresource\sleaks\sfor\sWinCE\sand\sCygwin,\sand\sa\scompiler\swarning\non\swindows\swith\sSQLITE_THREADSAFE=0.
++D 2013-10-16T11:31:51.060
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -205,7 -205,7 +205,7 @@@ F src/os.c b4ad71336fd96f97776f75587cd9
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c 243fb37f47dc072fc59839ea241ff0a17c8d76e6
- F src/os_win.c 0fea05bc7b75eccb01d8a8a10aaeaf4147b8e0cd
 -F src/os_win.c c812a3c37e113423f1579aba876acc240189d5d6
++F src/os_win.c b159b5249d9f70607d961bbdd1dbba789c75812c
  F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
  F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
  F src/parse.y a97566d6da75075589a7c716d1bda14b586cf8da
@@@ -1126,7 -1126,10 +1126,8 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 1086e00bcaacc88ef2a9dda8a20698b0899ad2f7
- R 278f7d19feecc0e16083c2fb7945cca7
- U dan
- Z 3437f433e75ea0cb69bfd1b37e4271cf
 -P 891df358e51075fb937f34952ce43bf51130b0d0
 -R 220c145b0b7752ec81af9a6d3dc55290
 -T *branch * wince-fixes
 -T *sym-wince-fixes *
 -T -sym-trunk *
 -U mistachkin
 -Z cf86f3f77bb8f85bf54a57b7b4d91994
++P 891df358e51075fb937f34952ce43bf51130b0d0 2470d1bb08b2661bcfde7a605208eb6044836d5c
++R 3f1c2053efd88b1ae5291031b868e02e
++T +closed 2470d1bb08b2661bcfde7a605208eb6044836d5c
++U drh
++Z 18d6dd21b38b2dda035b96ade3db584b
diff --cc manifest.uuid
index 2e66ae8df4,83cfd79a7d..5247a75335
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 891df358e51075fb937f34952ce43bf51130b0d0
 -2470d1bb08b2661bcfde7a605208eb6044836d5c
++9905cea9d45c90f2241f56dc32a25501476983bc
diff --cc src/os_win.c
index e1ed22c333,a6b3fb1a0c..c6c567c00c
--- a/src/os_win.c
+++ b/src/os_win.c
@@@ -3220,7 -3219,7 +3219,7 @@@ static void winShmPurge(sqlite3_vfs *pV
    while( (p = *pp)!=0 ){
      if( p->nRef==0 ){
        int i;
--      if( p->mutex ) sqlite3_mutex_free(p->mutex);
++      if( p->mutex ){ sqlite3_mutex_free(p->mutex); }
        for(i=0; i<p->nRegion; i++){
          BOOL bRc = osUnmapViewOfFile(p->aRegion[i].pMap);
          OSTRACE(("SHM-PURGE-UNMAP pid=%lu, region=%d, rc=%s\n",