diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-09-15 13:41:20 +0300 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-09-15 14:50:39 +0300 |
commit | 60ebd27931f2f9241e1ddad521af36c0ed991524 (patch) | |
tree | 68e7cb979848b90ea6db39918eeed535473d19ef /obexd/client | |
parent | bb57098100a9f47b1a0f6e2be8aa0a85a2d33384 (diff) | |
download | bluez-60ebd27931f2f9241e1ddad521af36c0ed991524.tar.gz |
obexd/mns: Check event value is valid
This adds a common check before passing the event value to the callback.
Diffstat (limited to 'obexd/client')
-rw-r--r-- | obexd/client/mns.c | 12 |
1 files 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; } } |