From: Iceman Date: Fri, 30 Jan 2015 14:17:07 +0000 (+0100) Subject: Update cmddata.c X-Git-Tag: v2.0.0-rc1~34^2 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0c5998c0518144270e9c85c2771bf29ddd906384 Update cmddata.c as suggested, a bitwise bounds check in cmddata. --- diff --git a/client/cmddata.c b/client/cmddata.c index cf4dc6b9..25d752f6 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -57,9 +57,8 @@ void printDemodBuff() } if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty - // equally divided by 16 - if ( bitLen % 16 > 0) - bitLen = (bitLen/16); + // ensure equally divided by 16 + bitLen &= 0xfff0; for (i = 0; i <= (bitLen-16); i+=16) { PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i", @@ -193,6 +192,11 @@ void printBitStream(uint8_t BitStream[], uint32_t bitLen) return; } if (bitLen>512) bitLen=512; + + // ensure equally divided by 16 + bitLen &= 0xfff0; + + for (i = 0; i <= (bitLen-16); i+=16) { PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i", BitStream[i],