DAOS-6685 Test: Fixed coverity issue in test code.

Fixed Coverity issue in test code. 313028(#2 of 2) and 313033(#1 of 1). Signed-off-by: Samir Raval <[email protected]>
daos-stack · Feb 18, 2021 · 2299998 · 2299998
1 parent 13375a5
commit 2299998
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/src/common/tests_dmg_helpers.c b/src/common/tests_dmg_helpers.c
@@ -583,13 +583,8 @@ parse_device_info(struct json_object *smd_dev, device_list *devices,
 	for (i = 0; i < dev_length; i++) {
 		dev = json_object_array_get_idx(smd_dev, i);
 
-		if (strlen(host + 2) <= DSS_HOSTNAME_MAX_LEN)
-			strcpy(devices[*disks].host, strtok(host, ":") + 1);
-		else {
-			D_ERROR("Hostname is larger than %d\n",
-				DSS_HOSTNAME_MAX_LEN);
-			return -DER_INVAL;
-		}
+		strncpy(devices[*disks].host, strtok(host, ":") + 1,
+			sizeof(devices[*disks].host) - 1);
 
 		if (!json_object_object_get_ex(dev, "uuid", &tmp)) {
 			D_ERROR("unable to extract uuid from JSON\n");
@@ -615,7 +610,9 @@ parse_device_info(struct json_object *smd_dev, device_list *devices,
 			D_ERROR("unable to extract state from JSON\n");
 			return -DER_INVAL;
 		}
-		strcpy(devices[*disks].state, json_object_to_json_string(tmp));
+
+		strncpy(devices[*disks].state, json_object_to_json_string(tmp),
+			sizeof(devices[*disks].state) - 1);
 
 		if (!json_object_object_get_ex(dev, "rank", &tmp)) {
 			D_ERROR("unable to extract rank from JSON\n");
@@ -656,19 +653,17 @@ dmg_storage_device_list(const char *dmg_config_file, int *ndisks,
 
 	if (!json_object_object_get_ex(dmg_out, "host_storage_map",
 				       &storage_map)) {
-		D_FREE(disk);
 		D_ERROR("unable to extract host_storage_map from JSON\n");
-		return -DER_INVAL;
+		D_GOTO(out, rc = -DER_INVAL);
 	}
 
 	json_object_object_foreach(storage_map, key, val) {
 		D_DEBUG(DB_TEST, "key:\"%s\",val=%s\n", key,
 			json_object_to_json_string(val));
 
 		if (!json_object_object_get_ex(val, "hosts", &hosts)) {
-			D_FREE(disk);
 			D_ERROR("unable to extract hosts from JSON\n");
-			return -DER_INVAL;
+			D_GOTO(out, rc = -DER_INVAL);
 		}
 
 		D_ALLOC(host, strlen(json_object_to_json_string(hosts)) + 1);
@@ -684,7 +679,7 @@ dmg_storage_device_list(const char *dmg_config_file, int *ndisks,
 					smd_info, "devices", &smd_dev)) {
 					D_ERROR("unable to extract devices\n");
 					D_FREE(host);
-					return -DER_INVAL;
+					D_GOTO(out, rc = -DER_INVAL);
 				}
 
 				if (smd_dev != NULL)
@@ -712,6 +707,7 @@ dmg_storage_device_list(const char *dmg_config_file, int *ndisks,
 	if (dmg_out != NULL)
 		json_object_put(dmg_out);
 
+out:
 	D_FREE(disk);
 	return rc;
 }