diff options
| author | jongmyeongko <jongmyeong.ko@samsung.com> | 2016-02-12 14:27:57 +0900 |
|---|---|---|
| committer | Jiwoong Im <jiwoong.im@samsung.com> | 2016-03-20 22:25:43 -0700 |
| commit | ecd5ee1e74538f83a71c4714ade2a8279ccbcaf5 (patch) | |
| tree | 516d64eb0e1ab375bf4852e742c2fa2a83aaff20 | |
| parent | ba8c375c5c67db319b97db9cf5d1164a99236493 (diff) | |
| download | libeventsystem-ecd5ee1e74538f83a71c4714ade2a8279ccbcaf5.tar.gz libeventsystem-ecd5ee1e74538f83a71c4714ade2a8279ccbcaf5.tar.bz2 libeventsystem-ecd5ee1e74538f83a71c4714ade2a8279ccbcaf5.zip | |
fix g_varinent_get related leaksubmit/tizen/20160405.052614accepted/tizen/wearable/20160406.012735accepted/tizen/tv/20160406.012707accepted/tizen/mobile/20160406.012648accepted/tizen/ivi/20160406.012803accepted/tizen/common/20160406.143522
Change-Id: Ic49c6928a6d7dcc601475e755f37b9e75b36e5c8
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>
| -rw-r--r-- | include/eventsystem.h | 8 | ||||
| -rw-r--r-- | src/eventsystem.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/eventsystem.h b/include/eventsystem.h index ae4b723..e6e1467 100644 --- a/include/eventsystem.h +++ b/include/eventsystem.h @@ -45,14 +45,6 @@ typedef enum _eventsystem_event_type { ES_TYPE_SYSTEM /* system event */ } eventsystem_event_type; -#define FREE_AND_NULL(ptr) do { \ - if (ptr) { \ - free((void *)ptr); \ - ptr = NULL; \ - } \ -} while (0) - - /** * APIs for Application Framework. */ diff --git a/src/eventsystem.c b/src/eventsystem.c index 1cef92c..6b61845 100644 --- a/src/eventsystem.c +++ b/src/eventsystem.c @@ -23,6 +23,13 @@ #define VALID_LAST_COUNT_FOR_EVENTNAME (VALID_COUNT_OF_EVENTNAME_TOKEN + 1) #define MAX_COUNT_FOR_EVENTNAME_CHECK (VALID_LAST_COUNT_FOR_EVENTNAME + 1) +#define FREE_AND_NULL(ptr) do { \ + if (ptr) { \ + free((void *)ptr); \ + ptr = NULL; \ + } \ +} while (0) + #define _E(fmt, arg...) LOGE(fmt, ##arg) #define _D(fmt, arg...) LOGD(fmt, ##arg) #define _W(fmt, arg...) LOGW(fmt, ##arg) @@ -280,6 +287,7 @@ static int __check_validation_usrevent_sender(int sender_pid, key = strdup(interface_name); if (key == NULL) { _E("out of memory"); + g_free(sender_id); return ES_R_ENOMEM; } @@ -287,10 +295,12 @@ static int __check_validation_usrevent_sender(int sender_pid, if (val == NULL) { _E("out of memory"); free(key); + g_free(sender_id); return ES_R_ENOMEM; } g_hash_table_insert(filter_tbl, key, val); + g_free(sender_id); return ES_R_OK; } @@ -1316,7 +1326,6 @@ static int __eventsystem_setup_trusted_peer(const char *event_name, const char * } param = g_variant_new("(ss)", event_name, dest_bus_name); - value = g_dbus_proxy_call_sync(proxy, "SetupTrustedPeer", param, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); if (error != NULL) { @@ -1375,7 +1384,6 @@ static int __eventsystem_requet_destination_list(const char *event_name, GList * } param = g_variant_new("(s)", event_name); - value = g_dbus_proxy_call_sync(proxy, "GetTrustedPeerList", param, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); if (error != NULL) { |