From: JooHark Park <juhaki.park@samsung.com>
Date: Thu, 2 May 2013 07:38:35 +0000 (+0900)
Subject: [Internal: prevent defect fixed - 52060 , 51874]
X-Git-Tag: accepted/tizen/20130520.101250~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fsystem%2Foma-dm-agent.git;a=commitdiff_plain;h=0e7544e7a22f85740996deb078af2fc7d83f88ef

[Internal: prevent defect fixed - 52060 , 51874]

=====================================
[Problem]
-
[Cause]
-
[Solution]
- prevent defect fixed - 52060 , 51874
=====================================

Change-Id: I5b42b65e64b502657968b29cd64a54789abece6a
---

diff --git a/src/agent/dm-engine/dm_common_engine.c b/src/agent/dm-engine/dm_common_engine.c
index dc87eeb..54ab3ce 100755
--- a/src/agent/dm-engine/dm_common_engine.c
+++ b/src/agent/dm-engine/dm_common_engine.c
@@ -190,8 +190,10 @@ DM_ERROR engine_replace_start(char *server_id, char *full_path, ENGINE_ID * serv
 	case SYNC_AGENT_DM_MO_TYPE_LAWMO:
 		_DEBUG_INFO("---------------------------------------------------------------- lawmo engine ready for replace cmd --------------------------------------------------------------------- ");
 		ret = DM_OK; //lawmo_replace(full_path, value, (LAWMO_Result_code *) resultCode, CHECK_OPERATION);
+/*
 		if(ret !=DM_OK)
 			goto error;
+*/
 		break;
 	default:
 		//(*resultCode) = CLIENT_ERROR;
diff --git a/src/agent/serviceadapter/sa_session.c b/src/agent/serviceadapter/sa_session.c
index c4c57fc..9865c53 100755
--- a/src/agent/serviceadapter/sa_session.c
+++ b/src/agent/serviceadapter/sa_session.c
@@ -752,6 +752,7 @@ static DM_ERROR _receive_changes_cmd(Session * session, Command * command)
 								char *server_id = NULL;
 								targetUrl = get_location_locuri(item->target);
 								server_id = session->pServer_id;
+								_DEBUG_TRACE("server_id [%s]", server_id);
 								//ret = engine_replace_start(server_id, targetUrl, &(session->service_engine_id), &resultStatus, item);
 								//resultStatus = DM_ERR_COMMAND_NOT_ALLOWED;
 							}
diff --git a/src/plugins/dm-private/slp-device-dm/src/plugin_slp_device_ctrl.c b/src/plugins/dm-private/slp-device-dm/src/plugin_slp_device_ctrl.c
index 45df53a..7a36815 100755
--- a/src/plugins/dm-private/slp-device-dm/src/plugin_slp_device_ctrl.c
+++ b/src/plugins/dm-private/slp-device-dm/src/plugin_slp_device_ctrl.c
@@ -149,7 +149,7 @@ void slp_device_ctrl_get_fota_fail_ua_result(char * str_UA_file_position)
 	}
 	fseek(file_des, 0, SEEK_END);
 	lSize = ftell(file_des);
-	if (lSize < 0) {
+	if (lSize <= 0) {
 		_DEBUG_INFO("ftell nagative return ");
 		if (file_des != NULL)
 			fclose(file_des);
@@ -158,7 +158,8 @@ void slp_device_ctrl_get_fota_fail_ua_result(char * str_UA_file_position)
 	}
 	rewind(file_des);
 	char *str_result = NULL;
-	str_result = (char *)calloc(1, lSize + 1);
+	//str_result = (char *)calloc(1, lSize + 1);
+	str_result = (char *)malloc(sizeof(char)*(lSize+1));
 	if (str_result == NULL) {
 		if (file_des != NULL)
 			fclose(file_des);
@@ -166,7 +167,7 @@ void slp_device_ctrl_get_fota_fail_ua_result(char * str_UA_file_position)
 		_EXTERN_FUNC_EXIT;
 		return;
 	}
-	memset(str_result, 0x0, lSize+1);	// PREVENT
+	memset(str_result, 0x0, sizeof(char)*(lSize+1));	// PREVENT
 
 	result = fread(str_result, 1, lSize, file_des);
 	if ((result != lSize) || (str_result == NULL)) {
@@ -241,7 +242,8 @@ int slp_device_ctrl_get_fota_update_result()
 	}
 	rewind(file_des);
 	char *str_result = NULL;
-	str_result = (char *)calloc(1, lSize + 1);
+	//str_result = (char *)calloc(1, lSize + 1);
+	str_result = (char *)malloc(sizeof(char)*(lSize+1));
 	if (str_result == NULL) {
 		if (file_des != NULL)
 			fclose(file_des);
@@ -250,7 +252,7 @@ int slp_device_ctrl_get_fota_update_result()
 		return 400;
 	}
 
-	memset(str_result, 0x0, lSize+1);	// PREVENT
+	memset(str_result, 0x0, sizeof(char)*(lSize+1));	// PREVENT
 
 	result = fread(str_result, 1, lSize, file_des);
 	if ((result != lSize) || (str_result == NULL)) {