Fix lemon so that it does not crash on a empty reduce action. Ticket #1892. (CVS...

FossilOrigin-Name: 4207ebc4e107df9f9f046be652f061e53263c8dd

diff --git a/manifest b/manifest
index 142428b3193dae0d22eed2adcfb8b9b911996224..61e2e4accde639b6ae33ac1adca533f372984408 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s"interrupt"\smethod\sto\sthe\sTCL\sinterface.\s\sTicket\s#1889.\s(CVS\s3332)
-D 2006-07-17T00:02:45
+C Fix\slemon\sso\sthat\sit\sdoes\snot\scrash\son\sa\sempty\sreduce\saction.\s\sTicket\s#1892.\s(CVS\s3333)
+D 2006-07-17T00:19:39
 F Makefile.in 9c2a76055c305868cc5f5b73e29a252ff3632c0a
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -304,7 +304,7 @@ F test/where.test ee7c9a6659b07e1ee61177f6e7ff71565ee2c9df
 F test/where2.test a16476a5913e75cf65b38f2daa6157a6b7791394
 F test/where3.test 3b5ad2c58069e12be2bd86bc5e211a82810521aa
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
-F tool/lemon.c c0ff92f7d44e108be8499d553f6fd7041487e707
+F tool/lemon.c b71e494b59ffd4a878e22c00e33e442958a4a1f5
 F tool/lempar.c 0a2a5cf96a98a64a5594625ad8fbdbe41dbaca50
 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
@@ -375,7 +375,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 9c6090c609afa9906029ed4ba22375f5bee058c4
-R ec56b496437631175dc2c4cfe87c3e4f
+P b0d19e575b14778e76ae5d6546fba0d2e9f25e33
+R 561f99ebf82ea369ef9b3313bf8e7d52
 U drh
-Z 78911d3d9efaa6da8fd47f85853e0527
+Z 12ff8c7d7f4fc93ec58cc516f73d8e63

diff --git a/manifest.uuid b/manifest.uuid
index 955b115105db606bbb26b4568eccdc90f60da7d2..34b6ae21dd4343e07a3ae29997c495fb8c79c44c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b0d19e575b14778e76ae5d6546fba0d2e9f25e33
\ No newline at end of file
+4207ebc4e107df9f9f046be652f061e53263c8dd
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index b2727c82a1783210814f6f9fd836ae5552e9c13a..759e1c378628955e8e2936464ad5f5d957c86db2 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -4111,6 +4111,7 @@ char *y;
 {
   char *z;
 
+  if( y==0 ) return 0;
   z = Strsafe_find(y);
   if( z==0 && (z=malloc( strlen(y)+1 ))!=0 ){
     strcpy(z,y);