admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

iscsi-support.c: fix memory leaks. Thanks valgrind, you rock

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2014-09-21 15:14:51 -07:00
parent 38798e2090
commit 264ea509c8
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test-tool/iscsi-support.c
View File

@@ -235,6 +235,9 @@ static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi
io_hdr.timeout = 5000; io_hdr.timeout = 5000;
if(ioctl(sdev->sgio_fd, SG_IO, &io_hdr) < 0){ if(ioctl(sdev->sgio_fd, SG_IO, &io_hdr) < 0){
if (sdev->error_str != NULL) {
free(discard_const(sdev->error_str));
}
sdev->error_str = strdup("SG_IO ioctl failed"); sdev->error_str = strdup("SG_IO ioctl failed");
return NULL; return NULL;
} }
@@ -261,6 +264,9 @@ static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi
task->sense.key, task->sense.key,
scsi_sense_ascq_str(task->sense.ascq), scsi_sense_ascq_str(task->sense.ascq),
task->sense.ascq); task->sense.ascq);
if (sdev->error_str != NULL) {
free(discard_const(sdev->error_str));
}
sdev->error_str = strdup(buf); sdev->error_str = strdup(buf);
return task; return task;
} }
@@ -270,6 +276,9 @@ static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi
task->sense.key = 0x0f; task->sense.key = 0x0f;
task->sense.ascq = 0xffff; task->sense.ascq = 0xffff;
if (sdev->error_str != NULL) {
free(discard_const(sdev->error_str));
}
sdev->error_str = strdup("SCSI masked error"); sdev->error_str = strdup("SCSI masked error");
return NULL; return NULL;
} }
@@ -279,6 +288,9 @@ static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi
task->sense.ascq = 0xffff; task->sense.ascq = 0xffff;
snprintf(buf, sizeof(buf), "SCSI host error. Status=0x%x", io_hdr.host_status); snprintf(buf, sizeof(buf), "SCSI host error. Status=0x%x", io_hdr.host_status);
if (sdev->error_str != NULL) {
free(discard_const(sdev->error_str));
}
sdev->error_str = strdup(buf); sdev->error_str = strdup(buf);
return task; return task;
} }
@@ -287,6 +299,9 @@ static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi
task->sense.key = 0x0f; task->sense.key = 0x0f;
task->sense.ascq = 0xffff; task->sense.ascq = 0xffff;
if (sdev->error_str != NULL) {
free(discard_const(sdev->error_str));
}
sdev->error_str = strdup("SCSI driver error"); sdev->error_str = strdup("SCSI driver error");
return NULL; return NULL;
} }