2 files changed, 14 insertions, 2 deletions
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 637bddb1fc..1862af4e25 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -57,6 +57,10 @@ int main(int argc, char **argv)
 	}
 
 	void *rom = loadrom(romname);
+	if (rom == NULL) {
+		printf("Could not load ROM image '%s'.\n", romname);
+		return 1;
+	}
 
 	if (strcmp(cmd, "print") == 0) {
 		print_cbfs_directory(romname);
@@ -68,11 +72,15 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	void *filename = argv[3];
-	void *cbfsname = argv[4];
+	char *filename = argv[3];
+	char *cbfsname = argv[4];
 
 	uint32_t filesize = 0;
 	void *filedata = loadfile(filename, &filesize, 0, SEEK_SET);
+	if (filedata == NULL) {
+		printf("Could not load file '%s'.\n", filename);
+		return 1;
+	}
 
 	uint32_t base = 0;
 	void *cbfsfile;
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 8db2d8cfe3..9227337c57 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -31,6 +31,8 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
 	       int place)
 {
 	FILE *file = fopen(filename, "rb");
+	if (file == NULL)
+		return NULL;
 	fseek(file, 0, SEEK_END);
 	*romsize_p = ftell(file);
 	fseek(file, 0, SEEK_SET);
@@ -65,6 +67,8 @@ void recalculate_rom_geometry(void *romarea)
 void *loadrom(const char *filename)
 {
 	void *romarea = loadfile(filename, &romsize, 0, SEEK_SET);
+	if (romarea == NULL)
+		return NULL;
 	recalculate_rom_geometry(romarea);
 	return romarea;
 }