From: drh <> Date: Tue, 2 Nov 2021 17:55:01 +0000 (+0000) Subject: Ensure that ALTER TABLE RENAME recognizes OOM errors while parsing X-Git-Tag: version-3.37.0~71 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61a8ad7cf952bc65b76b0a3a035ce5708459c853;p=thirdparty%2Fsqlite.git Ensure that ALTER TABLE RENAME recognizes OOM errors while parsing dependent triggers and handles them appropriately. dbsqlfuzz 53e245eee15d3f19639d773048aa955c30708785. FossilOrigin-Name: 1d9004cd015073853ce0ca811a68ea5411733eedee993b97a38a42ba139d7590 --- diff --git a/manifest b/manifest index b001a33bd4..369230c588 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sminor\smemory\sleak\sin\sthe\sshell\stool.\sOmit\srunning\sfuzztest\sas\spart\sof\sthe\sDevice-One\srelease\stest\sconfiguration,\sas\sit\sis\snow\sincompatible\swith\sSQLITE_OMIT_VIRTUALTABLE. -D 2021-11-02T14:01:41.022 +C Ensure\sthat\sALTER\sTABLE\sRENAME\srecognizes\sOOM\serrors\swhile\sparsing\ndependent\striggers\sand\shandles\sthem\sappropriately.\ndbsqlfuzz\s53e245eee15d3f19639d773048aa955c30708785. +D 2021-11-02T17:55:01.854 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -483,7 +483,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a -F src/alter.c d6b32481211fd5628b31d86329df6434bfc92e3372b53215339dc8cb47408644 +F src/alter.c d8dac98aa3b63b36660ab581c854660e511e1cef02702473d6c29d8655f4c013 F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516 F src/attach.c e3f9d9a2a4a844750f3f348f37afb244535f21382cbfcd840152cb21cb41cfaf F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf @@ -1930,7 +1930,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 ea7b12cdf868fdfebc0a20bdcba97aea863284b563d478b0e4cb3d2a8612afee -R 3d1a7f83cfea378cf032a2dcbfc8d068 -U dan -Z 5939626746911ed0a46ebf821b25baad +P 4d70f27b7b5681cfdf1c44ac654e565ccff089e74d3edf6660578e04e4b0c9b9 +R 020065121bfbc86728d941bc72e402a9 +U drh +Z e8c092d55961c0a6fa1569dc7a482ee4 diff --git a/manifest.uuid b/manifest.uuid index f982609237..ed9c4a7438 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4d70f27b7b5681cfdf1c44ac654e565ccff089e74d3edf6660578e04e4b0c9b9 \ No newline at end of file +1d9004cd015073853ce0ca811a68ea5411733eedee993b97a38a42ba139d7590 \ No newline at end of file diff --git a/src/alter.c b/src/alter.c index 92be915ef7..817ea64999 100644 --- a/src/alter.c +++ b/src/alter.c @@ -1333,6 +1333,9 @@ static int renameResolveTrigger(Parse *pParse){ } } } + if( rc==SQLITE_OK && db->mallocFailed ){ + rc = SQLITE_NOMEM; + } sNC.pSrcList = pSrc; if( rc==SQLITE_OK && pStep->pWhere ){ rc = sqlite3ResolveExprNames(&sNC, pStep->pWhere);