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

Initialize null fields with sane defaults in notification_init

Browse Source
This commit is contained in:
Nikos Tsipinakis 2017-01-01 18:06:27 +02:00
parent c6d783f5e2
commit 9ec8dbe5db
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/notification.c
View File

@ -165,8 +165,6 @@ void notification_free(notification * n)
free(n->icon); free(n->icon);
free(n->msg); free(n->msg);
free(n->dbus_client); free(n->dbus_client);
if (n->category && *n->category != '\0')
g_free(n->category); g_free(n->category);
if (n->text_to_render) if (n->text_to_render)
@ -312,11 +310,8 @@ char *notification_extract_markup_urls(char **str_ptr) {
} }
/* /*
* This is a helper function that allocates, initialises a notification and * Create notification struct and initialise everything to NULL,
* returns a pointer to it. All notifications should be created using this * this function is guaranteed to return a valid pointer.
* function. After setting all the necessary fields(i.e. appname, summary,
* body, icon etc) notification_init should be called to do the actual
* initialisation.
*/ */
notification *notification_create(void) notification *notification_create(void)
{ {
@ -326,14 +321,30 @@ notification *notification_create(void)
return n; return n;
} }
void notification_init_defaults(notification *n)
{
assert(n != NULL);
if(n->appname == NULL) n->appname = g_strdup("unknown");
if(n->summary == NULL) n->summary = g_strdup("");
if(n->body == NULL) n->body = g_strdup("");
if(n->category == NULL) n->category = g_strdup("");
}
/* /*
* Initialize the given notification and add it to * Initialize the given notification and add it to
* the queue. Replace notification with id if id > 0. * the queue. Replace notification with id if id > 0.
*
* n should be a pointer to a notification allocated with
* notification_create, it is undefined behaviour to pass a notification
* allocated some other way.
*/ */
int notification_init(notification * n, int id) int notification_init(notification * n, int id)
{ {
assert(n != NULL); assert(n != NULL);
//Prevent undefined behaviour by initialising required fields
notification_init_defaults(n);
if (strcmp("DUNST_COMMAND_PAUSE", n->summary) == 0) { if (strcmp("DUNST_COMMAND_PAUSE", n->summary) == 0) {
pause_display = true; pause_display = true;
return 0; return 0;
@ -349,10 +360,6 @@ int notification_init(notification * n, int id)
n->format = settings.format; n->format = settings.format;
if (n->category == NULL) {
n->category = "";
}
rule_apply_all(n); rule_apply_all(n);
n->urls = notification_extract_markup_urls(&(n->body)); n->urls = notification_extract_markup_urls(&(n->body));