From: Iceman <iceman@iuse.se>
Date: Sat, 30 Dec 2017 14:23:14 +0000 (+0100)
Subject: Merge pull request #533 from merlokk/chktd
X-Git-Tag: v3.1.0~95
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/e1e7a09db1d2fea34ea44c4cadda0c47ccf4269f?ds=sidebyside;hp=-c

Merge pull request #533 from merlokk/chktd

fix #532. looks at length of parameters.
---

e1e7a09db1d2fea34ea44c4cadda0c47ccf4269f
diff --combined client/cmdhfmf.c
index 5ebf8144,cca4da88..c471fdf7
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -987,6 -987,7 +987,7 @@@ int CmdHF14AMfChk(const char *Cmd
  	int i, res;
  	int	keycnt = 0;
  	char ctmp	= 0x00;
+ 	int clen = 0;
  	char ctmp3[3]	= {0x00};
  	uint8_t blockNo = 0;
  	uint8_t SectorsCnt = 0;
@@@ -1015,32 -1016,36 +1016,36 @@@
  		blockNo = param_get8(Cmd, 0);
  
  	ctmp = param_getchar(Cmd, 1);
- 	switch (ctmp) {
- 	case 'a': case 'A':
- 		keyType = 0;
- 		break;
- 	case 'b': case 'B':
- 		keyType = 1;
- 		break;
- 	case '?':
- 		keyType = 2;
- 		break;
- 	default:
- 		PrintAndLog("Key type must be A , B or ?");
- 		free(keyBlock);
- 		return 1;
- 	};
+ 	clen = param_getlength(Cmd, 1);
+ 	if (clen == 1) {
+ 		switch (ctmp) {
+ 		case 'a': case 'A':
+ 			keyType = 0;
+ 			break;
+ 		case 'b': case 'B':
+ 			keyType = 1;
+ 			break;
+ 		case '?':
+ 			keyType = 2;
+ 			break;
+ 		default:
+ 			PrintAndLog("Key type must be A , B or ?");
+ 			free(keyBlock);
+ 			return 1;
+ 		};
+ 	}
  
  	// transfer to emulator & create dump file
  	ctmp = param_getchar(Cmd, 2);
- 	if (ctmp == 't' || ctmp == 'T') transferToEml = 1;
- 	if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;
+ 	clen = param_getlength(Cmd, 2);
+ 	if (clen == 1 && (ctmp == 't' || ctmp == 'T')) transferToEml = 1;
+ 	if (clen == 1 && (ctmp == 'd' || ctmp == 'D')) createDumpFile = 1;
  	
  	param3InUse = transferToEml | createDumpFile;
  	
  	timeout14a = 500; // fast by default
  	// double parameters - ts, ds
- 	int clen = param_getlength(Cmd, 2);
+ 	clen = param_getlength(Cmd, 2);
  	if (clen == 2 || clen == 3){
  		param_getstr(Cmd, 2, ctmp3, sizeof(ctmp3));
  		ctmp = ctmp3[1];
@@@ -1089,7 -1094,7 +1094,7 @@@
  
  					if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
  
 -					if (!isxdigit(buf[0])){
 +					if (!isxdigit((unsigned char)buf[0])){
  						PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);
  						continue;
  					}