summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHwankyu Jhun <h.jhun@samsung.com>2016-11-10 07:26:06 +0900
committerHwankyu Jhun <h.jhun@samsung.com>2016-11-10 07:26:12 +0900
commit1781cc8fb4238860162d28433337c99fa67f6d1b (patch)
tree6ed55b3e0b3e6da948f202f656aee8c865c62aef
parent8a0989d0b13e5ac93cec00099755fa8776643fa0 (diff)
parentb6c2b539657af57394a3dde2b73a4cdf61844624 (diff)
downloadalarm-manager-1781cc8fb4238860162d28433337c99fa67f6d1b.tar.gz
alarm-manager-1781cc8fb4238860162d28433337c99fa67f6d1b.tar.bz2
alarm-manager-1781cc8fb4238860162d28433337c99fa67f6d1b.zip
Merge branch 'tizen_3.0' into tizen
Change-Id: I1216fa4cc1332553760c17309f3c2a1bf76ae955
-rw-r--r--src/alarm-lib-stub.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/alarm-lib-stub.c b/src/alarm-lib-stub.c
index 4b9bc3f..cd7fd82 100644
--- a/src/alarm-lib-stub.c
+++ b/src/alarm-lib-stub.c
@@ -56,6 +56,11 @@ bool _send_alarm_create_noti(alarm_context_t context, alarm_info_t *alarm_info,
int datalen = 0;
noti_gv = notification_ipc_make_gvariant_from_noti(noti, true);
+ if (!noti_gv) {
+ if (error_code)
+ *error_code = ERR_ALARM_SYSTEM_FAIL;
+ return false;
+ }
datalen = g_variant_get_size(noti_gv);
if (datalen < 0)
@@ -65,13 +70,6 @@ bool _send_alarm_create_noti(alarm_context_t context, alarm_info_t *alarm_info,
if (!data)
return false;
- if (!noti_gv) {
- if (error_code)
- *error_code = ERR_ALARM_SYSTEM_FAIL;
- free(data);
- return false;
- }
-
g_variant_store(noti_gv, data);
noti_data = g_base64_encode((guchar *)data, datalen);