Fix an off-by-one error in the error-handling logic of the Lemon

parser-generator.  This does not affect SQLite.
[forum:/forumpost/cff80737bf|Forum cff80737bf].

FossilOrigin-Name: 7cca80808cef192fe0479477056a028e230a164fd368e72100def065d424ca2c

diff --git a/manifest b/manifest
index 85a11e2e859d9737228e4219d7c195f90dc92f10..be220778a859be602941d0c33e340f9c7b2147d5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C By\sdefault,\sdo\snot\suse\smemory\smapping\sto\saccess\sthe\stemporary\sfiles\sused\sfor\sexternal\ssorts.\sThe\sold\sbehaviour\s(to\suse\smemory\smapping\sby\sdefault)\smay\sbe\srestored\sby\sbuilding\swith\sSQLITE_ENABLE_SORTER_MMAP\sdefined.
-D 2021-08-12T14:22:30.797
+C Fix\san\soff-by-one\serror\sin\sthe\serror-handling\slogic\sof\sthe\sLemon\nparser-generator.\s\sThis\sdoes\snot\saffect\sSQLite.\n[forum:/forumpost/cff80737bf|Forum\scff80737bf].
+D 2021-08-17T19:59:09.232
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1839,7 +1839,7 @@ F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/index_usage.c f62a0c701b2c7ff2f3e21d206f093c123f222dbf07136a10ffd1ca15a5c706c5
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
 F tool/lemon.c a5acddd3eec6a388872aae6efc7563336348a9c45e5563642f77e8e3a50e859d
-F tool/lempar.c 1d3d075da18681c67ecc66c1f171e7094e18cd2cfba6a8a1bd4f3f639d6656e1
+F tool/lempar.c bbabd74a36513a4376a6b26a35804b11adae6f335d47aab29cc3bbaaa85fa4d5
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
@@ -1920,7 +1920,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 19e56291a7344c7aa69e2845f11cb865ee10a6b89a00bbe74b3babbeebe0357b
-R 224fc103b7931c8813beab0567c100a0
-U dan
-Z fd2758fadab57227710ff616e01294ef
+P 306694dfb462f9d1f128461e7a8f15a0bb9b21fbc696caa1832f4b20749490d1
+R 54304cbb37b751a39391e2ab31ad143d
+U drh
+Z 050cb126e33da7c9d6a4f79c296a4a65

diff --git a/manifest.uuid b/manifest.uuid
index f6522eea2fb264bae547d2c18cb0f0e4a926b31a..67afe2ca30882722ef2aec38ca636dbc4921da84 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-306694dfb462f9d1f128461e7a8f15a0bb9b21fbc696caa1832f4b20749490d1
\ No newline at end of file
+7cca80808cef192fe0479477056a028e230a164fd368e72100def065d424ca2c
\ No newline at end of file

diff --git a/tool/lempar.c b/tool/lempar.c
index 35c3768bb9d9c2e259977f5668e5523f9c306491..cf61553a155c833dee5270965b921f675005d512 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -981,14 +981,14 @@ void Parse(
         yy_destructor(yypParser, (YYCODETYPE)yymajor, &yyminorunion);
         yymajor = YYNOCODE;
       }else{
-        while( yypParser->yytos >= yypParser->yystack
+        while( yypParser->yytos > yypParser->yystack
             && (yyact = yy_find_reduce_action(
                         yypParser->yytos->stateno,
                         YYERRORSYMBOL)) > YY_MAX_SHIFTREDUCE
         ){
           yy_pop_parser_stack(yypParser);
         }
-        if( yypParser->yytos < yypParser->yystack || yymajor==0 ){
+        if( yypParser->yytos <= yypParser->yystack || yymajor==0 ){
           yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
           yy_parse_failed(yypParser);
 #ifndef YYNOERRORRECOVERY