Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-02-24 23:54:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix possible null if no file found

Browse source 
also initialize filename variable so not null

found by iceman1001
This commit is contained in:
marshmellow42 2016-02-14 12:33:07 -05:00
parent b0c68b72d3
commit 165e0775b1
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/cmdhficlass.c
View file

@ -373,10 +373,13 @@ int CmdHFiClassDecrypt(const char *Cmd) {
//Open the tagdump-file //Open the tagdump-file
FILE *f; FILE *f;
char filename[FILE_PATH_SIZE]; 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"); f = fopen(filename, "rb");
}else{ if ( f == NULL ) {
PrintAndLog("Could not find file %s", filename);
return 1;
}
} else {
return usage_hf_iclass_decrypt(); return usage_hf_iclass_decrypt();
} }
@ -938,7 +941,7 @@ int usage_hf_iclass_clone(void) {
} }
int CmdHFiClassCloneTag(const char *Cmd) { int CmdHFiClassCloneTag(const char *Cmd) {
char filename[FILE_PATH_SIZE]; char filename[FILE_PATH_SIZE] = {0};
char tempStr[50]={0}; char tempStr[50]={0};
uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
uint8_t keyNbr = 0; uint8_t keyNbr = 0;
@ -1043,6 +1046,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
if (startblock<5) { if (startblock<5) {
PrintAndLog("You cannot write key blocks this way. yet... make your start block > 4"); PrintAndLog("You cannot write key blocks this way. yet... make your start block > 4");
fclose(f);
return 0; return 0;
} }
// now read data from the file from block 6 --- 19 // now read data from the file from block 6 --- 19