【修改内容】修改kk_lan内存泄漏问题

【提交人】陈伟灿

application/klansdk/kk_data_mng.c

@@ -339,56 +339,6 @@ int _deviceCode_switchto_mac(const char * deviceCode,char *mac)
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-char *double_value_string(double val)
-{
-	char *value = (char *)malloc(33);
-	memset(value,0,33);
-	
-	snprintf(value,32,"%6f",val);
-	return value;
-}
-
-
-
-
-
-
-
-
-
-
-
 int kk_map_dev_update_int_value(kk_map_dev_node_t *node,char *identifier,int val)
 {
 	int ret = 0;

application/klansdk/kk_lan_sync.c

@@ -79,12 +79,12 @@ cJSON *kk_sync_rooms_to_sdk(cJSON *root,cJSON *data)
 		item->room_name = name->valuestring;
 		item->room_status = NULL;
 	}
-
-
-	
-
 	roomsAry = _kk_syn_rooms_info(num,items);
 	cJSON_AddItemToObject(root, ROOMS_STR, roomsAry);
+	if(items != NULL){
+		free(items);
+		items = NULL;
+	}
 	return root;
 }
 
@@ -338,6 +338,14 @@ cJSON *kk_sync_scence_to_sdk(cJSON *root,cJSON *data)
 		sceneItem = kk_scene_build(&pScene);
 
 		cJSON_AddItemToArray(scenesAry,sceneItem);
+		if(pScene->act != NULL){
+			free(pScene->act);
+			pScene->act = NULL;
+		}
+		if(pScene->week != NULL){
+			free(pScene->week);
+			pScene->week = NULL;
+		}
 
 	}
 
@@ -931,14 +939,14 @@ static int kk_get_ac_indoor_info_by_deviceCode(cJSON *data,char *pdeviceCode,cha
 }
 
 
-
-new_dev_item g_new_item[64] = {0};
+#define CENTRAL_AC_INDOOR__MAX  64
+new_dev_item g_new_item[CENTRAL_AC_INDOOR__MAX] = {0};
 CENTRAL_AC_INDOOR_ITEM *g_indoor_item = NULL;
 int g_newgw_count = 0;
 int g_indoor_count = 0;
 void kk_clear_indoor_data()
 {
-	memset(g_new_item,0x0,sizeof(new_dev_item)*16);
+	memset(g_new_item,0x0,sizeof(new_dev_item)*CENTRAL_AC_INDOOR__MAX);
 	if(g_indoor_item != NULL){
 		free(g_indoor_item);
 		g_indoor_item = NULL;
@@ -1355,7 +1363,10 @@ cJSON *kk_sync_central_ac_indoorunits_to_sdk(cJSON *root,cJSON *data)
 	central_ac_indoorunits = _kk_sync_central_ac_indoorunits(g_indoor_count,indoorunitAry);
 	
 	cJSON_AddItemToObject(root, "central_ac_indoorunits", central_ac_indoorunits);	  
-
+	if(indoorunitAry != NULL){
+		free(indoorunitAry);
+		indoorunitAry = NULL;
+	}
 	return root;
 }
 
@@ -1410,27 +1421,40 @@ cJSON *kk_sync_groups_to_sdk(cJSON *root,cJSON *data)
 
 	grp.id = malloc(20);
 	memset(grp.id,0,20);
-	memcpy(grp.id,"1",sizeof("1"));
+	memcpy(grp.id,"1",strlen("1"));
 
 	grp.name = malloc(20);
 	memset(grp.name,0,20);
-	memcpy(grp.name,"2",sizeof("2"));
+	memcpy(grp.name,"2",strlen("2"));
 
 
 	char *list[2];
 	list[0] = malloc(20);
 	memset(list[0],0,20);
-	memcpy(list[0],"x",sizeof("x"));
+	memcpy(list[0],"x",strlen("x"));
 
 	list[1] = malloc(20);
 	memset(list[1],0,20);
-	memcpy(list[1],"y",sizeof("y"));
+	memcpy(list[1],"y",strlen("y"));
 
 	grp.nodes=_kk_sync_group_nodes(2,list);
 	groups = _kk_sync_groups(1,&grp);
 
+	
 
 	cJSON_AddItemToObject(root, "group", groups);
+	if(grp.id != NULL){
+		free(grp.id);
+	}
+	if(grp.name != NULL){
+		free(grp.name);
+	}	
+	if(list[0] != NULL){
+		free(list[0]);
+	}	
+	if(list[1] != NULL){
+		free(list[1]);
+	}		
 	return root;
 }
 
@@ -1478,26 +1502,41 @@ static int kk_create_floors_to_sdk(cJSON *root,cJSON *data)
 	memset(&flr,0,sizeof(SYN_FLOOR));
 	flr.floor_2_bg = malloc(20);
 	memset(flr.floor_2_bg,0,20);
-	memcpy(flr.floor_2_bg,"1",sizeof("1"));
+	memcpy(flr.floor_2_bg,"1",strlen("1"));
 	
 	
 	flr.floor_icon= malloc(20);
 	memset(flr.floor_icon,0,20);
-	memcpy(flr.floor_icon,"2",sizeof("2"));
+	memcpy(flr.floor_icon,"2",strlen("2"));
 	
 	flr.floor_pos= malloc(20);
 	memset(flr.floor_pos,0,20);
-	memcpy(flr.floor_pos,"3",sizeof("3"));
+	memcpy(flr.floor_pos,"3",strlen("3"));
 	flr.id= malloc(20);
 	memset(flr.id,0,20);
-	memcpy(flr.id,"4",sizeof("4"));
+	memcpy(flr.id,"4",strlen("4"));
 	flr.name= malloc(20);
 	memset(flr.name,0,20);
-	memcpy(flr.name,"一楼",sizeof("一楼"));
+	memcpy(flr.name,"一楼",strlen("一楼"));
 
 	floors = kk_create_floors(1,&flr);
 	
 	cJSON_AddItemToObject(root, "floors", floors);
+	if(flr.floor_2_bg != NULL){
+		free(flr.floor_2_bg);
+	}		
+	if(flr.floor_icon != NULL){
+		free(flr.floor_icon);
+	}	
+	if(flr.floor_pos != NULL){
+		free(flr.floor_pos);
+	}		
+	if(flr.id != NULL){
+		free(flr.id);
+	}	
+	if(flr.name != NULL){
+		free(flr.name);
+	}		
 	return 0;
 }