From: drh <drh@noemail.net>
Date: Mon, 27 Feb 2006 21:58:07 +0000 (+0000)
Subject: Detect stack overflow in the parser and report an error. (CVS 3112)
X-Git-Tag: version-3.6.10~3055
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fc3345f29d769e1f341b3a2ced155c1ada37896;p=thirdparty%2Fsqlite.git

Detect stack overflow in the parser and report an error. (CVS 3112)

FossilOrigin-Name: bd2c38f4670d1243284f2431b5e0712a6d1de1d7
---

diff --git a/manifest b/manifest
index 4cce4fc9c8..af95d761d2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Additional\scompiler\swarnings\ssuppressed.\s(CVS\s3111)
-D 2006-02-24T03:09:37
+C Detect\sstack\soverflow\sin\sthe\sparser\sand\sreport\san\serror.\s(CVS\s3112)
+D 2006-02-27T21:58:08
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -61,7 +61,7 @@ F src/os_win.c c67a2c46d929cf54c8f80ec5e6079cf684a141a9
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c f65d0b05182ff6059e9566b2eed1ec5f0cddc2f6
 F src/pager.h 425a9e52d5404158de016799715cbc2c3d685178
-F src/parse.y 52b8cdcceeaef01283138de5541dcadd2eeff486
+F src/parse.y 969fa5ddf747ba1034c9960cce49610c4b3fa617
 F src/pragma.c 607b0f3b1916aa01918acd08499bd6ef21065c23
 F src/prepare.c cf0fc8ebaf94409955ecb09ffeb0099c9ef44693
 F src/printf.c cda33918f602ff20bfba3ceae642ac1ed8f476d6
@@ -354,7 +354,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 4b22e4b847f8d5c29830baea541194ef3a0c4811
-R f5b7d68013d18e5a50ef6de23343b733
+P a359b1817e85a9c5f31085817ae70e3e0b8ac7a7
+R 9e1f3653271b124969ed2916a0c66ae2
 U drh
-Z 50c68272d78d2691ee80674d514a25a2
+Z b0010c3c2b756095a18a8f4b4a40541b
diff --git a/manifest.uuid b/manifest.uuid
index 4af09287ab..84a6e606cc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a359b1817e85a9c5f31085817ae70e3e0b8ac7a7
\ No newline at end of file
+bd2c38f4670d1243284f2431b5e0712a6d1de1d7
\ No newline at end of file
diff --git a/src/parse.y b/src/parse.y
index 45f40b2edf..0c176b1f11 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.196 2006/02/24 02:53:50 drh Exp $
+** @(#) $Id: parse.y,v 1.197 2006/02/27 21:58:08 drh Exp $
 */
 
 // All token codes are small integers with #defines that begin with "TK_"
@@ -40,6 +40,9 @@
     }
   }
 }
+%stack_overflow {
+  sqlite3ErrorMsg(pParse, "parser stack overflow");
+}
 
 // The name of the generated procedure that implements the parser
 // is as follows: