nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #537 from bebehei/icon-nullcheck

Browse Source 
Avoid NULL values in fnmatch's parameters
This commit is contained in:
Nikos Tsipinakis 2018-08-17 14:03:23 +03:00 committed by GitHub
commit 896c008def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rules.c
View File

@ -91,11 +91,11 @@ void rule_init(rule_t *r)
*/ */
bool rule_matches_notification(rule_t *r, notification *n) bool rule_matches_notification(rule_t *r, notification *n)
{ {
return ((!r->appname || !fnmatch(r->appname, n->appname, 0)) return ( (!r->appname || (n->appname && !fnmatch(r->appname, n->appname, 0)))
&& (!r->summary || !fnmatch(r->summary, n->summary, 0)) && (!r->summary || (n->summary && !fnmatch(r->summary, n->summary, 0)))
&& (!r->body || !fnmatch(r->body, n->body, 0)) && (!r->body || (n->body && !fnmatch(r->body, n->body, 0)))
&& (!r->icon || !fnmatch(r->icon, n->icon, 0)) && (!r->icon || (n->icon && !fnmatch(r->icon, n->icon, 0)))
&& (!r->category || !fnmatch(r->category, n->category, 0)) && (!r->category || (n->category && !fnmatch(r->category, n->category, 0)))
&& (r->match_transient == -1 || (r->match_transient == n->transient)) && (r->match_transient == -1 || (r->match_transient == n->transient))
&& (r->msg_urgency == URG_NONE || r->msg_urgency == n->urgency)); && (r->msg_urgency == URG_NONE || r->msg_urgency == n->urgency));
} }