database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-16 23:02:26 +03:00
Code Activity

Fix memory/resource leaks for WinCE and Cygwin.

Browse Source 
FossilOrigin-Name: 2470d1bb08b2661bcfde7a605208eb6044836d5c
This commit is contained in:
mistachkin
2013-10-16 09:49:10 +00:00
parent a4bbc8b119
commit c216566ba5
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifest
View File

@@ -1,5 +1,5 @@
C Add\sthe\s"languageid"\shidden\scolumn\sto\sfts4aux. C Fix\smemory/resource\sleaks\sfor\sWinCE\sand\sCygwin.
D 2013-10-15T19:06:17.574 D 2013-10-16T09:49:10.719
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654 F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -205,7 +205,7 @@ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_unix.c 243fb37f47dc072fc59839ea241ff0a17c8d76e6 F src/os_unix.c 243fb37f47dc072fc59839ea241ff0a17c8d76e6
F src/os_win.c 0fea05bc7b75eccb01d8a8a10aaeaf4147b8e0cd F src/os_win.c c812a3c37e113423f1579aba876acc240189d5d6
F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8 F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
F src/parse.y a97566d6da75075589a7c716d1bda14b586cf8da F src/parse.y a97566d6da75075589a7c716d1bda14b586cf8da
@@ -1126,7 +1126,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P 1086e00bcaacc88ef2a9dda8a20698b0899ad2f7 P 891df358e51075fb937f34952ce43bf51130b0d0
R 278f7d19feecc0e16083c2fb7945cca7 R 220c145b0b7752ec81af9a6d3dc55290
U dan T *branch * wince-fixes
Z 3437f433e75ea0cb69bfd1b37e4271cf T *sym-wince-fixes *
T -sym-trunk *
U mistachkin
Z cf86f3f77bb8f85bf54a57b7b4d91994

2
manifest.uuid
View File

@@ -1 +1 @@
891df358e51075fb937f34952ce43bf51130b0d0 2470d1bb08b2661bcfde7a605208eb6044836d5c

12
src/os_win.c
View File

@@ -2196,8 +2196,7 @@ static int winClose(sqlite3_file *id){
OSTRACE(("CLOSE file=%p\n", pFile->h)); OSTRACE(("CLOSE file=%p\n", pFile->h));
#if SQLITE_MAX_MMAP_SIZE>0 #if SQLITE_MAX_MMAP_SIZE>0
rc = winUnmapfile(pFile); winUnmapfile(pFile);
if( rc!=SQLITE_OK ) return rc;
#endif #endif
do{ do{
@@ -3003,7 +3002,7 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){
if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){ if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){
pFile->mmapSizeMax = newLimit; pFile->mmapSizeMax = newLimit;
if( pFile->mmapSize>0 ){ if( pFile->mmapSize>0 ){
(void)winUnmapfile(pFile); winUnmapfile(pFile);
rc = winMapfile(pFile, -1); rc = winMapfile(pFile, -1);
} }
} }
@@ -4073,6 +4072,7 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){
if( winIsDriveLetterAndColon(zDir) ){ if( winIsDriveLetterAndColon(zDir) ){
zConverted = winConvertFromUtf8Filename(zDir); zConverted = winConvertFromUtf8Filename(zDir);
if( !zConverted ){ if( !zConverted ){
sqlite3_free(zBuf);
OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n")); OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
return SQLITE_IOERR_NOMEM; return SQLITE_IOERR_NOMEM;
} }
@@ -4085,6 +4085,7 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){
}else{ }else{
zConverted = sqlite3MallocZero( nBuf+1 ); zConverted = sqlite3MallocZero( nBuf+1 );
if( !zConverted ){ if( !zConverted ){
sqlite3_free(zBuf);
OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n")); OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
return SQLITE_IOERR_NOMEM; return SQLITE_IOERR_NOMEM;
} }
@@ -4092,6 +4093,7 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){
osIsNT() ? CCP_POSIX_TO_WIN_W : CCP_POSIX_TO_WIN_A, zDir, osIsNT() ? CCP_POSIX_TO_WIN_W : CCP_POSIX_TO_WIN_A, zDir,
zConverted, nBuf+1)<0 ){ zConverted, nBuf+1)<0 ){
sqlite3_free(zConverted); sqlite3_free(zConverted);
sqlite3_free(zBuf);
OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_CONVPATH\n")); OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_CONVPATH\n"));
return winLogError(SQLITE_IOERR_CONVPATH, (DWORD)errno, return winLogError(SQLITE_IOERR_CONVPATH, (DWORD)errno,
"winGetTempname1", zDir); "winGetTempname1", zDir);
@@ -4105,6 +4107,7 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){
char *zUtf8 = winUnicodeToUtf8(zConverted); char *zUtf8 = winUnicodeToUtf8(zConverted);
if( !zUtf8 ){ if( !zUtf8 ){
sqlite3_free(zConverted); sqlite3_free(zConverted);
sqlite3_free(zBuf);
OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n")); OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
return SQLITE_IOERR_NOMEM; return SQLITE_IOERR_NOMEM;
} }
@@ -4120,7 +4123,6 @@ static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){
} }
sqlite3_free(zConverted); sqlite3_free(zConverted);
} }
break;
} }
} }
#elif !SQLITE_OS_WINRT && !defined(__CYGWIN__) #elif !SQLITE_OS_WINRT && !defined(__CYGWIN__)
@@ -4490,9 +4492,9 @@ static int winOpen(
#endif #endif
{ {
sqlite3_free(zConverted); sqlite3_free(zConverted);
sqlite3_free(zTmpname);
} }
sqlite3_free(zTmpname);
pFile->pMethod = &winIoMethod; pFile->pMethod = &winIoMethod;
pFile->pVfs = pVfs; pFile->pVfs = pVfs;
pFile->h = h; pFile->h = h;