From: drh <>
Date: Mon, 22 Jul 2024 17:09:30 +0000 (+0000)
Subject: Do not abort the resolver early if a LIMIT expression does not resolve, as
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f4cf78c2b830e6c14323ff46a37a014ee3ce469;p=thirdparty%2Fsqlite.git

Do not abort the resolver early if a LIMIT expression does not resolve, as
that can result in a memory leak.

FossilOrigin-Name: ac6dc8c605374fbc955d3ba8c030334c085dda1bc75fdbd7d381da97b3fa341e
---

diff --git a/manifest b/manifest
index 079f71874b..ab08731b18 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\sallow\svariables\sin\sLIMIT\sclauses\sif\sthe\sLIMIT\sis\swithin\sa\sLATERAL\ssubquery\nand\sthe\svariable\sresolves\sto\sanother\sFROM\sclause\sterm\sto\sthe\sleft\sof\sthe\nsubquery.\s\sWe\scannot\sallow\svariables\sfrom\souter\scontexts\sbecause\sthe\sLIMIT\nvalue\sis\scomputed\sbefore\sthe\scursors\sin\sthe\souter\scontext\shave\sbeen\sinitialized.
-D 2024-07-22T16:59:35.769
+C Do\snot\sabort\sthe\sresolver\searly\sif\sa\sLIMIT\sexpression\sdoes\snot\sresolve,\sas\nthat\scan\sresult\sin\sa\smemory\sleak.
+D 2024-07-22T17:09:30.553
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -753,7 +753,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c d99931f45416652895e502328ca49fe782cfc4e1ebdcda13b3736d991ebf42ce
 F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c 8dc8832973fd9f695e85042577d4e21f5b91c4f4576d311d418ad11387fd75ed
+F src/resolve.c a3d8ad8e1eb2595ff0a1cd59422d3f654105dfe30c9ea5adb4785c6b8dd742d7
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 1f5f1663fe84ee1963a55aef8871f1e7740a8030db517dcbfa16e27c6187fe74
 F src/shell.c.in b7d435c137eb323981adff814f172dbaabb9ba504fef17cb11d4681c1633ee13
@@ -2196,8 +2196,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c9d3427de5b55303279449023b7d7957821bfe97089547dcafcfb913806745ed
-R 41a4aad165dcb3790b8abe2f6b5c4bd9
+P 0a2531c3a3750fd22360595274eb97fa66d17a90502180b7b11adc5b136da5ed
+R dec238c5a9346c3f0443bc20a366e7c8
 U drh
-Z 133ddb98c99accb293096ad5d3d47230
+Z 0a42b253973367d8067bc6c0cdb43155
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bab32365d4..1cecd8e021 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0a2531c3a3750fd22360595274eb97fa66d17a90502180b7b11adc5b136da5ed
+ac6dc8c605374fbc955d3ba8c030334c085dda1bc75fdbd7d381da97b3fa341e
diff --git a/src/resolve.c b/src/resolve.c
index a4a52e140b..b7e5529ba3 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1910,9 +1910,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
             ** variables from other FROM clause terms to the left of the
             ** subquery to be used in the LIMIT/OFFSET clause. */
             sNC.pNext = 0;
-            if( sqlite3ResolveExprNames(&sNC, pItem->pSelect->pLimit) ){
-              return WRC_Abort;
-            }
+            (void)sqlite3ResolveExprNames(&sNC, pItem->pSelect->pLimit);
           }
           sNC.pNext = pOuterNC;
           pSubNC = &sNC;