From: drh Date: Tue, 3 Oct 2017 14:24:24 +0000 (+0000) Subject: The simplification to sqlite3SelectExpand() in last night's X-Git-Tag: version-3.21.0~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2463398fd1154581c078347b5000201b54f037e;p=thirdparty%2Fsqlite.git The simplification to sqlite3SelectExpand() in last night's [3a4ffb21] check-in was not completely correct. This adjustment is needed for correct OOM handling in some configurations. FossilOrigin-Name: c5ad5e1675f6cb5a54df21606dfec2198a7cf88acc529460ebe27bdab128a6e5 --- diff --git a/manifest b/manifest index 7c8cd81854..0c2ed835c9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\scompute\scolumn\sand\srow\ssize\sestimates\sfor\sthe\stransient\sTable\sobjects\nassociated\swith\sthe\sresult\sset\sof\sa\sSELECT\sstatement,\ssince\sthose\sestimates\nare\snever\sused\sfor\sanything\sconstructive. -D 2017-10-03T03:01:09.197 +C The\ssimplification\sto\ssqlite3SelectExpand()\sin\slast\snight's\n[3a4ffb21]\scheck-in\swas\snot\scompletely\scorrect.\s\sThis\sadjustment\sis\sneeded\nfor\scorrect\sOOM\shandling\sin\ssome\sconfigurations. +D 2017-10-03T14:24:24.678 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f @@ -458,7 +458,7 @@ F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac -F src/select.c 1a11e6ab321c22a20146c44d315ece07899f7abad5dab839c9d4cf6556ef588b +F src/select.c 948aa57117275e1f3c6713254ec2baae09be058bec40ab7dcc41960202b756e5 F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7 @@ -1655,7 +1655,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 3a4ffb21d0ee2326c31b9ddc512d79d4ebf3a249a2840e88e99165978eec31fd -R 2ffb7cd4a155ee43580067e1a47b5521 +P e4342fd401d4025eecc53ebfcd59f3150166a5f0bd6adb1b5820703bd4a1ec58 +R 067a132a78e0ff9232176facb949a1bf U drh -Z 7536be1ae6bc2716a9cf67864c3578f3 +Z ad07329ae2092cc1b6846d3db3cadef4 diff --git a/manifest.uuid b/manifest.uuid index 0fc4d2a1df..6176434c11 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e4342fd401d4025eecc53ebfcd59f3150166a5f0bd6adb1b5820703bd4a1ec58 \ No newline at end of file +c5ad5e1675f6cb5a54df21606dfec2198a7cf88acc529460ebe27bdab128a6e5 \ No newline at end of file diff --git a/src/select.c b/src/select.c index c77e14a832..8109408697 100644 --- a/src/select.c +++ b/src/select.c @@ -4729,7 +4729,8 @@ void sqlite3SelectPrep( Select *p, /* The SELECT statement being coded. */ NameContext *pOuterNC /* Name context for container */ ){ - assert( p!=0 ); + assert( p!=0 || pParse->db->mallocFailed ); + if( pParse->db->mallocFailed ) return; if( p->selFlags & SF_HasTypeInfo ) return; sqlite3SelectExpand(pParse, p); if( pParse->nErr || pParse->db->mallocFailed ) return;