From 43469969d0ff4d8c825328b928fd3491d9dcd9ff Mon Sep 17 00:00:00 2001 From: youngman Date: Mon, 21 Dec 2015 19:49:30 +0900 Subject: [PATCH] NULL Check (icd-payload.c) Change-Id: I853d04feef1bf9b460a86887190c8a3c973651d6 Signed-off-by: youngman --- daemon/icd-ioty.c | 10 ++++++---- daemon/icd-payload.c | 9 +++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/daemon/icd-ioty.c b/daemon/icd-ioty.c index 428b559..50c3128 100644 --- a/daemon/icd-ioty.c +++ b/daemon/icd-ioty.c @@ -795,12 +795,14 @@ OCDoHandle icd_ioty_observer_start(GVariant *resource, int observe_policy, return NULL; } - if (IOTCON_OBSERVE_IGNORE_OUT_OF_ORDER == observe_policy) + switch (observe_policy) { + case IOTCON_OBSERVE_IGNORE_OUT_OF_ORDER: method = OC_REST_OBSERVE; - else if (IOTCON_OBSERVE_ACCEPT_OUT_OF_ORDER == observe_policy) - method = OC_REST_OBSERVE_ALL; - else + break; + case IOTCON_OBSERVE_ACCEPT_OUT_OF_ORDER: + default: method = OC_REST_OBSERVE_ALL; + } oic_conn_type = icd_ioty_conn_type_to_oic_conn_type(conn_type); diff --git a/daemon/icd-payload.c b/daemon/icd-payload.c index e2d8551..003566e 100644 --- a/daemon/icd-payload.c +++ b/daemon/icd-payload.c @@ -592,6 +592,10 @@ static void _icd_state_value_from_gvariant(OCRepPayload *repr, GVariantIter *ite } else if (g_variant_is_of_type(var, G_VARIANT_TYPE_STRING)) { str_value = g_variant_get_string(var, NULL); + if (NULL == str_value) { + ERR("g_variant_get_string() Fail"); + return; + } if (IC_STR_EQUAL == strcmp(IC_STR_NULL, str_value)) OCRepPayloadSetNull(repr, key); else @@ -652,6 +656,11 @@ OCRepPayload* icd_payload_representation_from_gvariant(GVariant *var) cur = repr; while (g_variant_iter_loop(children, "v", &child)) { cur->next = icd_payload_representation_from_gvariant(child); + if (NULL == cur->next) { + ERR("icd_payload_representation_from_gvariant() Fail"); + OCRepPayloadDestroy(repr); + return NULL; + } cur = cur->next; } return repr; -- 2.34.1