summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkj7.sung <kj7.sung@samsung.com>2015-12-21 20:16:16 +0900
committerkj7.sung <kj7.sung@samsung.com>2015-12-21 20:16:16 +0900
commit0c289f39b11071ee8bc3f702e7ca4b2117d90717 (patch)
tree36b562f7bff27df69ed3e9116efce3ee78ff7672
parent99e1d3c6822b6825852f563bcc9a12c9d4858363 (diff)
downloadlbs-dbus-0c289f39b11071ee8bc3f702e7ca4b2117d90717.tar.gz
lbs-dbus-0c289f39b11071ee8bc3f702e7ca4b2117d90717.tar.bz2
lbs-dbus-0c289f39b11071ee8bc3f702e7ca4b2117d90717.zip
Change-Id: I281ba8261c87f0f9aefc6bdf4f21e964dc09ce44 Signed-off-by: kj7.sung <kj7.sung@samsung.com>
-rw-r--r--client/src/lbs_dbus_client.c4
-rw-r--r--server/src/lbs_dbus_server.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/client/src/lbs_dbus_client.c b/client/src/lbs_dbus_client.c
index 869d71c..77795ee 100644
--- a/client/src/lbs_dbus_client.c
+++ b/client/src/lbs_dbus_client.c
@@ -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);
diff --git a/server/src/lbs_dbus_server.c b/server/src/lbs_dbus_server.c
index f9e8690..63f109f 100644
--- a/server/src/lbs_dbus_server.c
+++ b/server/src/lbs_dbus_server.c
@@ -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);