updated for version 7.3.802

Problem:    After setting 'isk' to a value ending in a comma appending to the
            option fails.
Solution:   Disallow a trailing comma for 'isk' and similar options.

diff --git a/src/charset.c b/src/charset.c
index b5dcfac1ba1180ddca16227eaa411acb23dd6dd9..fd4b500be58072785533e785e5bde7171841bcbb 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -284,7 +284,12 @@ buf_init_chartab(buf, global)
                }
                ++c;
            }
+
+           c = *p;
            p = skip_to_option_part(p);
+           if (c == ',' && *p == NUL)
+               /* Trailing comma is not allowed. */
+               return FAIL;
        }
     }
     chartab_initialized = TRUE;

diff --git a/src/version.c b/src/version.c
index 69184b05ad3de90a1366bb423f6050b62b869b76..90ac7247e98949f2a170f2192749828603585ac1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    802,
 /**/
     801,
 /**/