zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-22 10:02:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

make sure rec->preg isn't NULL

Browse source
This commit is contained in:
Jari Matilainen 2018-01-20 13:57:56 +01:00
commit 082fa97107
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/fe-common/core/hilight-text.c
View file

@ -197,22 +197,28 @@ static gboolean hilight_match_text(HILIGHT_REC *rec, SERVER_REC *server, const c
int *match_beg, int *match_end) int *match_beg, int *match_end)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
if (rec->regexp && rec->preg == NULL)
return ret;
WI_ITEM_REC *witem = window_item_find(server, channel); WI_ITEM_REC *witem = window_item_find(server, channel);
char *pattern = rec->expando ? (parse_special_string(rec->regexp ? g_regex_get_pattern(rec->preg) : rec->text, server, witem, "", NULL, 0)) : char *pattern = rec->expando ? (parse_special_string(rec->regexp ? g_regex_get_pattern(rec->preg) : rec->text, server, witem, "", NULL, 0)) :
rec->text; rec->text;
if (pattern == NULL || strlen(pattern) == 0) if (pattern == NULL || strlen(pattern) == 0)
return FALSE; return ret;
if (rec->regexp) { if (rec->regexp) {
MatchInfo *match; MatchInfo *match;
GRegex *regex = i_regex_new(pattern, G_REGEX_OPTIMIZE | (rec->case_sensitive ? 0 : G_REGEX_CASELESS), 0, NULL); GRegex *regex = !rec->expando ? rec->preg :
i_regex_new(pattern, G_REGEX_OPTIMIZE | (rec->case_sensitive ? 0 : G_REGEX_CASELESS), 0, NULL);
i_regex_match(regex, text, 0, &match); i_regex_match(regex, text, 0, &match);
if (i_match_info_matches(match)) if (i_match_info_matches(match))
ret = i_match_info_fetch_pos(match, 0, match_beg, match_end); ret = i_match_info_fetch_pos(match, 0, match_beg, match_end);
i_match_info_free(match); i_match_info_free(match);
if(rec->expando)
i_regex_unref(regex); i_regex_unref(regex);
} else { } else {
char *match; char *match;