Fixed SVACE defects 46/55046/1 accepted/tizen/mobile/20151222.024311 accepted/tizen/tv/20151222.024358 accepted/tizen/wearable/20151222.024449 submit/tizen/20151222.020240 submit/tizen_common/20151229.142028 submit/tizen_common/20151229.144031 submit/tizen_common/20151229.154718
authorkj7.sung <kj7.sung@samsung.com>
Mon, 21 Dec 2015 11:16:16 +0000 (20:16 +0900)
committerkj7.sung <kj7.sung@samsung.com>
Mon, 21 Dec 2015 11:16:16 +0000 (20:16 +0900)
Change-Id: I281ba8261c87f0f9aefc6bdf4f21e964dc09ce44
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
client/src/lbs_dbus_client.c
server/src/lbs_dbus_server.c

index 869d71c..77795ee 100644 (file)
@@ -306,7 +306,7 @@ lbs_client_start_batch(lbs_client_dbus_h lbs_client, lbs_client_callback_e callb
        LBS_CLIENT_LOGD("lbs_client_start_batch");
 
        g_return_val_if_fail(lbs_client, LBS_CLIENT_ERROR_PARAMETER);
-       g_return_val_if_fail(callback_type, LBS_CLIENT_ERROR_PARAMETER);
+       g_return_val_if_fail(callback_type < LBS_CLIENT_LOCATION_CB || callback_type > LBS_CLIENT_BATCH_CB, LBS_CLIENT_ERROR_PARAMETER);
 
        lbs_client_dbus_s *handle = (lbs_client_dbus_s *)lbs_client;
        g_return_val_if_fail(handle->is_started == FALSE, LBS_CLIENT_ERROR_STATUS);
@@ -596,7 +596,7 @@ lbs_client_start(lbs_client_dbus_h lbs_client, unsigned int interval, lbs_client
        LBS_CLIENT_LOGD("lbs_client_start");
 
        g_return_val_if_fail(lbs_client, LBS_CLIENT_ERROR_PARAMETER);
-       g_return_val_if_fail(callback_type, LBS_CLIENT_ERROR_PARAMETER);
+       g_return_val_if_fail(callback_type < LBS_CLIENT_LOCATION_CB || callback_type > LBS_CLIENT_BATCH_CB, LBS_CLIENT_ERROR_PARAMETER);
 
        lbs_client_dbus_s *handle = (lbs_client_dbus_s *)lbs_client;
        g_return_val_if_fail(handle->is_started == FALSE, LBS_CLIENT_ERROR_STATUS);
index f9e8690..63f109f 100644 (file)
@@ -635,11 +635,12 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u
        }
 
        object = lbs_object_skeleton_new(path);
-       g_free(path);
        if (object == NULL) {
                LBS_SERVER_LOGE("Can't create object. path: %s", path);
+               g_free(path);
                return;
        }
+       g_free(path);
 
        ctx->obj_skeleton = object;
        lbs_dbus_setup_position_interface(object, ctx);