From 165e0775b1660a4dfc1f95338585bcb663b6b5e7 Mon Sep 17 00:00:00 2001
From: marshmellow42 <marshmellowrf@gmail.com>
Date: Sun, 14 Feb 2016 12:33:07 -0500
Subject: [PATCH 1/1] fix possible null if no file found
also initialize filename variable so not null
found by iceman1001
---
client/cmdhficlass.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 54b780c7..4cf9d3ea 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -373,10 +373,13 @@ int CmdHFiClassDecrypt(const char *Cmd) {
//Open the tagdump-file
FILE *f;
char filename[FILE_PATH_SIZE];
- if(opt == 'f' && param_getstr(Cmd, 1, filename) > 0)
- {
+ if(opt == 'f' && param_getstr(Cmd, 1, filename) > 0) {
f = fopen(filename, "rb");
- }else{
+ if ( f == NULL ) {
+ PrintAndLog("Could not find file %s", filename);
+ return 1;
+ }
+ } else {
return usage_hf_iclass_decrypt();
}
@@ -938,7 +941,7 @@ int usage_hf_iclass_clone(void) {
}
int CmdHFiClassCloneTag(const char *Cmd) {
- char filename[FILE_PATH_SIZE];
+ char filename[FILE_PATH_SIZE] = {0};
char tempStr[50]={0};
uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
uint8_t keyNbr = 0;
@@ -1043,6 +1046,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
if (startblock<5) {
PrintAndLog("You cannot write key blocks this way. yet... make your start block > 4");
+ fclose(f);
return 0;
}
// now read data from the file from block 6 --- 19
--
2.39.5