From: dan Date: Mon, 1 Dec 2025 17:22:15 +0000 (+0000) Subject: Fix a crash that could occur following a parse error on this branch. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac0f2d58979e937c233b053ceca51f08875ce892;p=thirdparty%2Fsqlite.git Fix a crash that could occur following a parse error on this branch. FossilOrigin-Name: 951b4533509fae971e252be3ecd3623ac2bdce16220e0ce372e600f728f80f69 --- diff --git a/manifest b/manifest index 8fbfe12727..c4ef4d02d4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sanother\sproblem\sthat\scould\sfollow\san\sOOM\sfault\son\sthis\sbranch. -D 2025-11-18T19:58:56.490 +C Fix\sa\scrash\sthat\scould\soccur\sfollowing\sa\sparse\serror\son\sthis\sbranch. +D 2025-12-01T17:22:15.541 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -794,7 +794,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c cb3294cf23c11106b50d9af6998a6c1bf389b52e15b17698c9fab97bbaa9b37f F src/treeview.c 3ce7ac9835d2d70cc1c868b01b747ae8a062322e155701e58e3d62ca79aada7a -F src/trigger.c baaf21b17f4c6748862acd84dd8629199b6ccb38428f6a3772ad4d048d1c36eb +F src/trigger.c 4983328a32feff8774503da634688aad96c7febf1e838ce9df92c3672f1fa64f F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165 @@ -2176,8 +2176,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 0e4c2b889edbe801bb8ff29bbdb0b3139bdc85e696ccdf5bf51d7e5f9fdde961 -R 7427adc47fec9c1fa2f660c0ced89c09 +P c4cc80eb281f7c8da3d62fec03b2258ce8d0063fc9cfff61f2cbcdd01e13c391 +R 2c80bedbc8d39f5ed20d2f9111a22a22 U dan -Z 00fda250558a84e382c3e238e44e4f7b +Z 4cc55d003d3e663865fa89fedb536d6f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bbfa7b224d..73fb8170be 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c4cc80eb281f7c8da3d62fec03b2258ce8d0063fc9cfff61f2cbcdd01e13c391 +951b4533509fae971e252be3ecd3623ac2bdce16220e0ce372e600f728f80f69 diff --git a/src/trigger.c b/src/trigger.c index 58b2745ae5..5673fa727b 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -563,7 +563,7 @@ TriggerStep *sqlite3TriggerUpdateStep( TriggerStep *pTriggerStep; pTriggerStep = triggerStepAllocate(pParse, TK_UPDATE, pTabList, zStart, zEnd); - if( db->mallocFailed==0 ){ + if( pTriggerStep ){ SrcList *pFromDup = 0; if( IN_RENAME_OBJECT ){ pTriggerStep->pExprList = pEList;