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

TESTS: Dont memcpy if task==NULL

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2014-09-19 17:33:21 -07:00
parent 1e3cc445c8
commit d11e4175f7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1621,7 +1621,7 @@ read6(struct scsi_device *sdev, uint32_t lba,
task = send_scsi_command(sdev, task, NULL); task = send_scsi_command(sdev, task, NULL);
ret = check_result("READ6", sdev, task, status, key, ascq, num_ascq); ret = check_result("READ6", sdev, task, status, key, ascq, num_ascq);
if (data) { if (data && task) {
memcpy(data, task->datain.data, task->datain.size); memcpy(data, task->datain.data, task->datain.size);
} }
if (task) { if (task) {
@@ -1654,7 +1654,7 @@ read10(struct scsi_device *sdev, struct scsi_task **out_task,
task = send_scsi_command(sdev, task, NULL); task = send_scsi_command(sdev, task, NULL);
ret = check_result("READ10", sdev, task, status, key, ascq, num_ascq); ret = check_result("READ10", sdev, task, status, key, ascq, num_ascq);
if (data) { if (data && task) {
memcpy(data, task->datain.data, task->datain.size); memcpy(data, task->datain.data, task->datain.size);
} }
if (out_task) { if (out_task) {
@@ -1688,7 +1688,7 @@ read12(struct scsi_device *sdev, uint32_t lba,
task = send_scsi_command(sdev, task, NULL); task = send_scsi_command(sdev, task, NULL);
ret = check_result("READ12", sdev, task, status, key, ascq, num_ascq); ret = check_result("READ12", sdev, task, status, key, ascq, num_ascq);
if (data) { if (data && task) {
memcpy(data, task->datain.data, task->datain.size); memcpy(data, task->datain.data, task->datain.size);
} }
if (task) { if (task) {
@@ -1720,7 +1720,7 @@ read16(struct scsi_device *sdev, uint64_t lba,
task = send_scsi_command(sdev, task, NULL); task = send_scsi_command(sdev, task, NULL);
ret = check_result("READ16", sdev, task, status, key, ascq, num_ascq); ret = check_result("READ16", sdev, task, status, key, ascq, num_ascq);
if (data) { if (data && task) {
memcpy(data, task->datain.data, task->datain.size); memcpy(data, task->datain.data, task->datain.size);
} }
if (task) { if (task) {