X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/14331320c4fe733b60bed9e638be0989286a41e4..6fe5c94bda4d272dc739b71ed5e54a8678f6065a:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 58035278..d4dcf661 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -646,7 +646,7 @@ int CmdVikingDemod(const char *Cmd)
 		return 0;
 	}
 	size_t size = DemodBufferLen;
-	//call lfdemod.c demod for gProxII
+	//call lfdemod.c demod for Viking
 	int ans = VikingDemod_AM(DemodBuffer, &size);
 	if (ans < 0) {
 		if (g_debugMode) PrintAndLog("Error Viking_Demod %d", ans);
@@ -1507,6 +1507,10 @@ int CmdFDXBdemodBI(const char *Cmd){
 		if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex);
 		return 0;
 	}
+	if (size != 128) {
+		if (g_debugMode) PrintAndLog("Error incorrect data length found");
+		return 0;
+	}
 
 	setDemodBuf(BitStream, 128, preambleIndex);
 
@@ -1576,6 +1580,9 @@ int PSKDemod(const char *Cmd, bool verbose)
 		//invalid carrier
 		return 0;
 	}
+	if (g_debugMode){
+		PrintAndLog("Carrier: rf/%d",carrier);
+	}
 	int errCnt=0;
 	errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
 	if (errCnt > maxErr){
@@ -1617,7 +1624,7 @@ int CmdIndalaDecode(const char *Cmd)
 	uint8_t invert=0;
 	size_t size = DemodBufferLen;
 	size_t startIdx = indala26decode(DemodBuffer, &size, &invert);
-	if (startIdx < 1) {
+	if (startIdx < 1 || size > 224) {
 		if (g_debugMode==1)
 			PrintAndLog("Error2: %d",ans);
 		return -1;
@@ -1711,7 +1718,7 @@ int NRZrawDemod(const char *Cmd, bool verbose)
 	size_t BitLen = getFromGraphBuf(BitStream);
 	if (BitLen==0) return 0;
 	int errCnt=0;
-	errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert, maxErr);
+	errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert);
 	if (errCnt > maxErr){
 		if (g_debugMode) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
 		return 0;