From 3f5bcc3b927e4a132e9e87b864ba7342c4423b37 Mon Sep 17 00:00:00 2001 From: Alexis Green Date: Tue, 2 Aug 2016 16:12:44 -0700 Subject: [PATCH 1/2] FIX: CoverityScan 121362 - Pointer to local outside scope --- client/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/util.c b/client/util.c index e81d76001..b2ac82ae1 100644 --- a/client/util.c +++ b/client/util.c @@ -221,7 +221,7 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) { // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii // up to 64 bytes or 512 bits uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){ - uint8_t buf[64]; + static uint8_t buf[64]; memset(buf, 0x00, 64); uint8_t *tmp = buf; for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){ @@ -229,7 +229,7 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)]; } } - return tmp; + return buf; } // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), From 987c59849ef113c8111e7b3a7067b87a6837c882 Mon Sep 17 00:00:00 2001 From: Alexis Green Date: Tue, 2 Aug 2016 22:44:36 -0700 Subject: [PATCH 2/2] FIX: CoverityScan 123358 and 133864 - Unchecked return value --- client/cmdhflegic.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c index 916825812..4ad60e3b0 100644 --- a/client/cmdhflegic.c +++ b/client/cmdhflegic.c @@ -579,7 +579,10 @@ int CmdLegicCalcCrc8(const char *Cmd){ // peek at length of the input string so we can // figure out how many elements to malloc in "data" bg=en=0; - param_getptr(Cmd, &bg, &en, cmdp+1); + if (param_getptr(Cmd, &bg, &en, cmdp+1)) { + errors = true; + break; + } len = (en - bg + 1); // check that user entered even number of characters @@ -599,7 +602,10 @@ int CmdLegicCalcCrc8(const char *Cmd){ break; } - param_gethex(Cmd, cmdp+1, data, len); + if (param_gethex(Cmd, cmdp+1, data, len)) { + errors = true; + break; + } len >>= 1; cmdp += 2;