nano

commit a4933873c9e1ab4718ab24737cadc0be71d608cd
parent 1861052234fd542e845d679387359bf7ba4c458d
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Mon, 30 Sep 2019 19:41:06 +0200

tweaks: avoid leaking memory when finding an invalid string  [coverity]

Diffstat:
M
src/rcfile.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -1169,8 +1169,6 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
 			option++;
 		ptr = parse_argument(ptr);
 
-		option = mallocstrcpy(NULL, option);
-
 #ifdef ENABLE_UTF8
 		/* When in a UTF-8 locale, ignore arguments with invalid sequences. */
 		if (using_utf8() && mbstowcs(NULL, option, 0) == (size_t)-1) {
@@ -1178,6 +1176,8 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
 			continue;
 		}
 #endif
+		option = mallocstrcpy(NULL, option);
+
 #ifdef ENABLE_COLOR
 		if (strcasecmp(rcopts[i].name, "titlecolor") == 0)
 			color_combo[TITLE_BAR] = parse_interface_color(option);