From 1a1a8e89a9517bd1089ae4cfdb47f279715aaf94 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Thu, 23 Mar 2017 13:43:57 +0800 Subject: [PATCH] test/scsi: Assert callocs do not return NULL Change-Id: I4cf2027c5fbb09e8c451d4c9c40ccee2f55973f2 Signed-off-by: Ziye Yang --- test/lib/scsi/dev/Makefile | 1 + test/lib/scsi/dev/dev_ut.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/test/lib/scsi/dev/Makefile b/test/lib/scsi/dev/Makefile index 62144b1e0..6f57dd6fe 100644 --- a/test/lib/scsi/dev/Makefile +++ b/test/lib/scsi/dev/Makefile @@ -37,6 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk SPDK_LIB_LIST = log +CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi LIBS += $(SPDK_LIB_LINKER_ARGS) LIBS += -lcunit diff --git a/test/lib/scsi/dev/dev_ut.c b/test/lib/scsi/dev/dev_ut.c index aa1c5d808..38ee0a5c9 100644 --- a/test/lib/scsi/dev/dev_ut.c +++ b/test/lib/scsi/dev/dev_ut.c @@ -36,6 +36,7 @@ #include #include "CUnit/Basic.h" +#include "spdk_cunit.h" #include "dev.c" #include "port.c" @@ -92,6 +93,8 @@ spdk_scsi_lun_construct(const char *name, struct spdk_bdev *bdev) struct spdk_scsi_lun *lun; lun = calloc(1, sizeof(struct spdk_scsi_lun)); + SPDK_CU_ASSERT_FATAL(lun != NULL); + snprintf(lun->name, sizeof(lun->name), "%s", name); lun->bdev = bdev; return lun; @@ -123,6 +126,8 @@ spdk_scsi_lun_claim(struct spdk_scsi_lun *lun) } p = calloc(1, sizeof(struct lun_entry)); + SPDK_CU_ASSERT_FATAL(p != NULL); + p->lun = lun; TAILQ_INSERT_TAIL(&g_lun_head, p, lun_entries);