From ba57684d73616af0c1678a54f4c8b13287cd8572 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Fri, 8 May 2020 15:34:49 +0200 Subject: [PATCH] fix NULL assertion in format args --- src/fe-text/textbuffer-formats.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c index f48773bc..edd14dbc 100644 --- a/src/fe-text/textbuffer-formats.c +++ b/src/fe-text/textbuffer-formats.c @@ -255,10 +255,10 @@ static char *fallback_format(TEXT_BUFFER_FORMAT_REC *format_rec) GString *bs; char *tmp; bs = g_string_new(NULL); - g_string_printf(bs, "{%s#%s ", format_rec->module, format_rec->format); - for (i = 0; i < format_rec->nargs; i++) { + g_string_printf(bs, "{%s#%s", format_rec->module, format_rec->format); + for (i = 0; i < format_rec->nargs && format_rec->args[i] != NULL; i++) { tmp = g_strescape(format_rec->args[i], ""); - g_string_append_printf(bs, "\"%s\"%s", tmp, i + 1 < format_rec->nargs ? " " : ""); + g_string_append_printf(bs, " \"%s\"", tmp); g_free(tmp); } g_string_append(bs, "}");