From: drh <drh@noemail.net>
Date: Thu, 30 Mar 2017 16:37:05 +0000 (+0000)
Subject: Ensure that the stack space used to hold the Lemon-generated parser object
X-Git-Tag: version-3.19.0~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecc0f84d0883731c72226f5c7bbb407f745a8911;p=thirdparty%2Fsqlite.git

Ensure that the stack space used to hold the Lemon-generated parser object
is always 8-byte aligned.

FossilOrigin-Name: 1279de0b70cabf39899d92ece8852a780fd800bf3154971537b3427e5bd3ca50
---

diff --git a/manifest b/manifest
index 8bf3b9e785..46218e908b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\scompiling\swith\sMSVC,\sdisable\sextra\sSELECT/WHERE\stracing\sfor\sdynamically\sbuilt\sshells.
-D 2017-03-29T23:22:18.563
+C Ensure\sthat\sthe\sstack\sspace\sused\sto\shold\sthe\sLemon-generated\sparser\sobject\nis\salways\s8-byte\saligned.
+D 2017-03-30T16:37:05.021
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@ -461,7 +461,7 @@ F src/test_windirent.c 17f91f5f2aa1bb7328abb49414c363b5d2a9d3ff
 F src/test_windirent.h 5d67483a55442e31e1bde0f4a230e6e932ad5906
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
-F src/tokenize.c dc748c5afcb9e5beb3ef5651bc99a4622e30f6a1
+F src/tokenize.c d62a8f879807d100e681a039778ca1bcb018b6a0fc3c1b4173549ee61ee4b5cf
 F src/treeview.c 84d0ac737e1231702679f0289180021e19c5cc186ec413e8dcb704a887c76ec8
 F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
 F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
@@ -1569,7 +1569,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 4a01880b62706c12d6f16f7c2b5c8b0dc67a9a8a0a48c5b42451e1a133e85611
-R 3adffbd2ee409684adfb0dddf60b32b6
-U mistachkin
-Z 8f5b8ec1599d13d0314f838adb184b49
+P a68919425c528b887e66b588a73a619f0506cb06855350e0ec8f844acf64d8f7
+R 82cf7572a7c54f3566dc03bfc0762992
+U drh
+Z a2cdaa19784e815fd6dc9c68b48174fe
diff --git a/manifest.uuid b/manifest.uuid
index f2f9b29f93..cf9b333b31 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a68919425c528b887e66b588a73a619f0506cb06855350e0ec8f844acf64d8f7
\ No newline at end of file
+1279de0b70cabf39899d92ece8852a780fd800bf3154971537b3427e5bd3ca50
\ No newline at end of file
diff --git a/src/tokenize.c b/src/tokenize.c
index 578ddc4f00..60df70c3c4 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -482,7 +482,8 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
   sqlite3 *db = pParse->db;       /* The database connection */
   int mxSqlLen;                   /* Max length of an SQL string */
 #ifdef sqlite3Parser_ENGINEALWAYSONSTACK
-  unsigned char zSpace[sizeof(yyParser)];  /* Space for parser engine object */
+  /* Space to hold the Lemon-generated Parser object */
+  sqlite3_uint64 zSpace[(sizeof(yyParser)+7)/sizeof(sqlite_uint64)];
 #endif
 
   assert( zSql!=0 );