From 60ebd27931f2f9241e1ddad521af36c0ed991524 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 15 Sep 2014 13:41:20 +0300 Subject: [PATCH] obexd/mns: Check event value is valid This adds a common check before passing the event value to the callback. --- obexd/client/mns.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/obexd/client/mns.c b/obexd/client/mns.c index 124dbcfb7..76b7d1ce1 100644 --- a/obexd/client/mns.c +++ b/obexd/client/mns.c @@ -191,9 +191,6 @@ static void parse_event_report_handle(struct map_event *event, static void parse_event_report_folder(struct map_event *event, const char *value) { - if (!value) - return; - g_free(event->folder); if (g_str_has_prefix(value, "/")) @@ -205,9 +202,6 @@ static void parse_event_report_folder(struct map_event *event, static void parse_event_report_old_folder(struct map_event *event, const char *value) { - if (!value) - return; - g_free(event->old_folder); if (g_str_has_prefix(value, "/")) @@ -219,9 +213,6 @@ static void parse_event_report_old_folder(struct map_event *event, static void parse_event_report_msg_type(struct map_event *event, const char *value) { - if (!value) - return; - g_free(event->msg_type); event->msg_type = g_strdup(value); } @@ -256,7 +247,8 @@ static void event_report_element(GMarkupParseContext *ctxt, for (parser = event_report_parsers; parser && parser->name; parser++) { if (strcasecmp(key, parser->name) == 0) { - parser->func(event, values[i]); + if (values[i]) + parser->func(event, values[i]); break; } } -- 2.11.0