From b0bdfbb0f77091517678bd86e1fda1b12de181e5 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 9 Mar 2016 20:28:50 +0000
Subject: [PATCH] Producing an adequate error message when the syntax name is
improperly quoted. This fixes Savannah bug #47324.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5711 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 4 ++++
src/rcfile.c | 21 ++++++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ef74d0fd..970f44a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-09 Benno Schulenberg <bensberg@justemail.net>
+ * src/rcfile.c (parse_syntax): Produce an adequate error message
+ when the syntax name is unquoted. This fixes Savannah bug #47324.
+
2016-03-04 Benno Schulenberg <bensberg@justemail.net>
* src/color.c (found_in_list): Don't bother keeping the compiled
regular expression when it matched -- drop this tiny optimization
diff --git a/src/rcfile.c b/src/rcfile.c
index e7dd7692..7e634312 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -266,7 +266,7 @@ bool nregcomp(const char *regex, int eflags)
* global list of color syntaxes. */
void parse_syntax(char *ptr)
{
- const char *fileregptr = NULL, *nameptr = NULL;
+ char *fileregptr, *nameptr;
regexlisttype *endext = NULL;
/* The end of the extensions list for this syntax. */
@@ -274,21 +274,24 @@ void parse_syntax(char *ptr)
assert(ptr != NULL);
- if (*ptr == '\0') {
+ /* Check that the syntax name is not empty. */
+ if (*ptr == '\0' || (*ptr == '"' &&
+ (*(ptr + 1) == '\0' || *(ptr + 1) == '"'))) {
rcfile_error(N_("Missing syntax name"));
return;
}
- if (*ptr != '"') {
- rcfile_error(
- N_("Regex strings must begin and end with a \" character"));
+ nameptr = ++ptr;
+ ptr = parse_next_word(ptr);
+
+ /* Check that the name starts and ends with a double quote. */
+ if (*(nameptr - 1) != '\x22' || nameptr[strlen(nameptr) - 1] != '\x22') {
+ rcfile_error(N_("A syntax name must be quoted"));
return;
}
- nameptr = ++ptr;
- ptr = parse_next_regex(ptr);
- if (ptr == NULL)
- return;
+ /* Strip the end quote. */
+ nameptr[strlen(nameptr) - 1] = '\0';
/* Redefining the "none" syntax is not allowed. */
if (strcmp(nameptr, "none") == 0) {
--
GitLab