From b6c2b539657af57394a3dde2b73a4cdf61844624 Mon Sep 17 00:00:00 2001 From: Hyunho Kang Date: Tue, 8 Nov 2016 16:36:55 +0900 Subject: [PATCH] Fix NULL dereference defect Change-Id: I58e5ba3102f62e6d006a718235eaca0c42bebb27 Signed-off-by: Hyunho Kang --- src/alarm-lib-stub.c | 12 +++++------- 1 file 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); -- 2.7.4