From 19fc90fa71fd851fa3f5577e4c451b40f8033e2c Mon Sep 17 00:00:00 2001
From: Brian Pow <brianpow@gmail.com>
Date: Wed, 7 Feb 2018 22:10:59 +0800
Subject: [PATCH] FIX: Stop dumping/restoreing a tag if failed to generate
 filename using uid

---
 client/cmdhfmf.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a18d50ea8..0e4b4ee2e 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -786,8 +786,11 @@ int CmdHF14AMfRestore(const char *Cmd) {
 		return usage_hf14_restore();
 	
 	filename=GenerateFilename("hf-mf-","-key.bin");
+	if (filename == NULL) 
+		return 1;
+			
 	if ((fkeys = fopen(filename,"rb")) == NULL) {
-		PrintAndLog("Could not find file %s",fkeys);
+		PrintAndLog("Could not find file %s", filename);
 		return 1;
 	}
 	
@@ -813,6 +816,9 @@ int CmdHF14AMfRestore(const char *Cmd) {
 	fclose(fkeys);
 
 	filename=GenerateFilename("hf-mf-","-data.bin");
+	if (filename == NULL) 
+		return 1;
+			
 	if ((fdump = fopen(filename,"rb")) == NULL) {
 		PrintAndLog("Could not find file %s", filename);
 		return 1;
@@ -1076,6 +1082,9 @@ int CmdHF14AMfNested(const char *Cmd) {
 		// Create dump file
 		if (createDumpFile) {
 			fptr = GenerateFilename("hf-mf-","-key.bin");
+			if (fptr == NULL) 
+				return 1;
+			
 			if ((fkeys = fopen(fptr, "wb")) == NULL) { 
 				PrintAndLog("[!] could not create file %s", fptr);
 				free(e_sector);
@@ -1420,6 +1429,9 @@ out:
 	
 	if (createDumpFile) {
 		fptr = GenerateFilename("hf-mf-","-key.bin");
+		if (fptr == NULL) 
+			return 1;
+
 		FILE *fkeys = fopen(fptr,"wb");
 		if (fkeys == NULL) { 
 			PrintAndLog("Could not create file %s", filename);
@@ -1702,6 +1714,9 @@ out:
 	
 	if (createDumpFile) {
 		fptr = GenerateFilename("hf-mf-","-key.bin");
+		if (fptr == NULL) 
+			return 1;
+
 		FILE *fkeys = fopen(fptr,"wb");
 		if (fkeys == NULL) { 
 			PrintAndLog("Could not create file %s", fptr);