From bdce246bc0d3ce8f97bfafd9e348b0471d3fe4ad Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Tue, 14 May 2013 23:01:48 -0700 Subject: [PATCH] TESTS: Fix trying to free a NULL task. --- test-tool/iscsi-test-cu.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c index 162be22..7422d7f 100644 --- a/test-tool/iscsi-test-cu.c +++ b/test-tool/iscsi-test-cu.c @@ -863,9 +863,9 @@ main(int argc, char *argv[]) CU_ErrorAction error_action = CUEA_IGNORE; int res; struct scsi_readcapacity10 *rc10; - struct scsi_task *inq_task; + struct scsi_task *inq_task = NULL; struct scsi_task *inq_lbp_task = NULL; - struct scsi_task *rc16_task; + struct scsi_task *rc16_task = NULL; int full_size; int is_usb; static struct option long_opts[] = { @@ -1138,9 +1138,15 @@ main(int argc, char *argv[]) free(testname_re); free(discard_const(tgt_url)); - scsi_free_scsi_task(inq_task); - //scsi_free_scsi_task(inq_lbp_task); - scsi_free_scsi_task(rc16_task); + if (inq_task != NULL) { + scsi_free_scsi_task(inq_task); + } + if (inq_lbp_task != NULL) { + scsi_free_scsi_task(inq_lbp_task); + } + if (rc16_task != NULL) { + scsi_free_scsi_task(rc16_task); + } return 0; }