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

Don't free() things allicated through scsi_malloc()

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2016-02-20 14:27:52 -08:00
parent 0629d44e83
commit b240bf1a2c
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/scsi-lowlevel.c
View File

@@ -790,7 +790,6 @@ scsi_serviceactionin_datain_unmarshall(struct scsi_task *task)
gls->descriptors = scsi_malloc(task, gls->descriptors = scsi_malloc(task,
sizeof(*gls->descriptors) * len); sizeof(*gls->descriptors) * len);
if (gls->descriptors == NULL) { if (gls->descriptors == NULL) {
free(gls);
return NULL; return NULL;
} }
@@ -1315,7 +1314,6 @@ scsi_inquiry_unmarshall_supported_pages(struct scsi_task *task)
inq->num_pages = task_get_uint8(task, 3); inq->num_pages = task_get_uint8(task, 3);
inq->pages = scsi_malloc(task, inq->num_pages); inq->pages = scsi_malloc(task, inq->num_pages);
if (inq->pages == NULL) { if (inq->pages == NULL) {
free (inq);
return NULL; return NULL;
} }
memcpy(inq->pages, &task->datain.data[4], inq->num_pages); memcpy(inq->pages, &task->datain.data[4], inq->num_pages);
@@ -1336,7 +1334,6 @@ scsi_inquiry_unmarshall_unit_serial_number(struct scsi_task* task)
inq->usn = scsi_malloc(task, task_get_uint8(task, 3) + 1); inq->usn = scsi_malloc(task, task_get_uint8(task, 3) + 1);
if (inq->usn == NULL) { if (inq->usn == NULL) {
free(inq);
return NULL; return NULL;
} }
memcpy(inq->usn, &task->datain.data[4], task_get_uint8(task, 3)); memcpy(inq->usn, &task->datain.data[4], task_get_uint8(task, 3));
@@ -1396,11 +1393,8 @@ scsi_inquiry_unmarshall_device_identification(struct scsi_task *task)
while (inq->designators) { while (inq->designators) {
struct scsi_inquiry_device_designator *dev = inq->designators; struct scsi_inquiry_device_designator *dev = inq->designators;
inq->designators = dev->next; inq->designators = dev->next;
free(dev->designator);
free(dev);
} }
free(inq);
return NULL; return NULL;
} }