aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #1188 from ailin-nemui/null-format

Browse Source 
fix npe on no text from format_get_text_theme_charargs
This commit is contained in:
ailin-nemui 2020-05-07 21:46:55 +02:00 committed by GitHub
commit 9bfbb5cdf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fe-text/textbuffer-formats.c
View File

@ -249,6 +249,22 @@ static char *parse_colors(TEXT_DEST_REC *dest, const char *text)
return tmp; return tmp;
} }
static char *fallback_format(TEXT_BUFFER_FORMAT_REC *format_rec)
{
int i;
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++) {
tmp = g_strescape(format_rec->args[i], "");
g_string_append_printf(bs, "\"%s\"%s", tmp, i + 1 < format_rec->nargs ? " " : "");
g_free(tmp);
}
g_string_append(bs, "}");
return g_string_free(bs, FALSE);
}
char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line) char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
{ {
TEXT_DEST_REC dest; TEXT_DEST_REC dest;
@ -287,11 +303,14 @@ char *textbuffer_line_get_text(TEXT_BUFFER_REC *buffer, LINE_REC *line)
memcpy(arglist, format_rec->args, format_rec->nargs * sizeof(char *)); memcpy(arglist, format_rec->args, format_rec->nargs * sizeof(char *));
text = format_get_text_theme_charargs(theme, format_rec->module, &dest, text = format_get_text_theme_charargs(theme, format_rec->module, &dest,
formatnum, arglist); formatnum, arglist);
if (text == NULL) {
text = fallback_format(format_rec);
}
} else { } else {
text = g_strdup(format_rec->args[1]); text = g_strdup(format_rec->args[1]);
} }
if (*text != '\0') { if (text != NULL && *text != '\0') {
current_time = curr->info.time; current_time = curr->info.time;
tmp = format_get_level_tag(theme, &dest); tmp = format_get_level_tag(theme, &dest);