FIX: coverity scan found some bugs in EMV code. These are the fixes to:

[proxmark3-svn] / common / lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 8b951dc86abdb5464d4b8cc44535ae038bac4bec..6b6743574e594ce26ef28ba35ba5efd5ce1e534d 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -7,22 +7,20 @@
 //-----------------------------------------------------------------------------
 // Low frequency demod/decode commands
 //-----------------------------------------------------------------------------
-
-#include <stdlib.h>
 #include "lfdemod.h"
-#include <string.h>
 
 //un_comment to allow debug print calls when used not on device
 void dummy(char *fmt, ...){}
 
+
 #ifndef ON_DEVICE
-#include "ui.h"
-#include "cmdparser.h"
-#include "cmddata.h"
-#define prnt PrintAndLog
+# include "ui.h"
+# include "cmdparser.h"
+# include "cmddata.h"
+# define prnt PrintAndLog
 #else 
        uint8_t g_debugMode=0;
-#define prnt dummy
+# define prnt dummy
 #endif
 
 //test samples are not just noise
@@ -350,9 +348,9 @@ int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
 int manrawdecode(uint8_t * BitStream, size_t *size, uint8_t invert){
-       uint16_t bitnum = 0, MaxBits = 512, errCnt = 0;
+       int errCnt = 0, bestErr = 1000;
+       uint16_t bitnum = 0, MaxBits = 512, bestRun = 0;
        size_t i, k;
-       uint16_t bestErr = 1000, bestRun = 0;
        if (*size < 16) return -1;
        //find correct start position [alignment]
        for (k=0; k < 2; ++k){
@@ -698,7 +696,7 @@ int VikingDemod_AM(uint8_t *dest, size_t *size) {
 // by iceman
 // find Visa2000 preamble in already demoded data
 int Visa2kDemod_AM(uint8_t *dest, size_t *size) {
-       if (*size < 96*2) return -1; //make sure buffer has data
+       if (*size < 96) return -1; //make sure buffer has data
        size_t startIdx = 0;
        uint8_t preamble[] = {0,1,0,1,0,1,1,0,0,1,0,0,1,0,0,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,1,0};
        uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
@@ -710,7 +708,7 @@ int Visa2kDemod_AM(uint8_t *dest, size_t *size) {
 // by iceman
 // find Noralsy preamble in already demoded data
 int NoralsyDemod_AM(uint8_t *dest, size_t *size) {
-       if (*size < 96*2) return -1; //make sure buffer has data
+       if (*size < 96) return -1; //make sure buffer has data
        size_t startIdx = 0;
        uint8_t preamble[] = {1,0,1,1,1,0,1,1,0,0,0,0};
        uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);