diff options
| author | drh <drh@noemail.net> | 2016-08-12 11:01:20 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-08-12 11:01:20 +0000 |
| commit | a48d7e77496b1463c2bea902b331b049bbcaeb01 (patch) | |
| tree | 3b303936e075d099f92ff1b56de50b0f6e233068 | |
| parent | 088645b090ccc41ac2d8d00441d958917d846b22 (diff) | |
| download | sqlite-a48d7e77496b1463c2bea902b331b049bbcaeb01.tar.gz sqlite-a48d7e77496b1463c2bea902b331b049bbcaeb01.zip | |
Fix a post-OOM memory leak.
FossilOrigin-Name: 14009b32b955b42cfd5f0c2ce7d4b3ce19ce201e
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/expr.c | 5 |
3 files changed, 10 insertions, 9 deletions
@@ -1,5 +1,5 @@ -C Merge\srecent\schanges\sfrom\strunk. -D 2016-08-11T12:31:21.178 +C Fix\sa\spost-OOM\smemory\sleak. +D 2016-08-12T11:01:20.692 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a @@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0 F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f -F src/expr.c dfc2275726e0a4916f10fe6b5b4f45fff835e790 +F src/expr.c 04b320c93f61ddc24ee032dd83317179c5f78a8b F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771 @@ -1516,7 +1516,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 8278be06fa69e3266866220bdaf5be45a5fcfa23 ab83d7077da80ddbcf399d0797d79e964dc64f0e -R 8a0bc19d70d02f930372e2439d9171fd +P 959677b97ba15f786936c762e2e68df1151d7ed0 +R a5cbb9bafc9fbcda9f99cc259b487bcb U drh -Z 019cf0a70c3da3c6f133d37b0001aac6 +Z b67a6933488c39df334f580c3bf48fca diff --git a/manifest.uuid b/manifest.uuid index 8c6670f9f..847f607ac 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -959677b97ba15f786936c762e2e68df1151d7ed0
\ No newline at end of file +14009b32b955b42cfd5f0c2ce7d4b3ce19ce201e
\ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 8303c5f78..5ef692a44 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2506,12 +2506,13 @@ static void sqlite3ExprCodeIN( if( sqlite3ExprCheckIN(pParse, pExpr) ) return; zAff = exprINAffinity(pParse, pExpr); + if( zAff==0 ) return; nVector = sqlite3ExprVectorSize(pExpr->pLeft); aiMap = (int*)sqlite3DbMallocZero( pParse->db, nVector*(sizeof(int) + sizeof(char)) + 1 ); - if( !zAff || !aiMap ){ - sqlite3DbFree(pParse->db, aiMap); + if( aiMap==0 ){ + sqlite3DbFree(pParse->db, zAff); return; } |