X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/29ce214c65d0d36679b8496dd8dddf4ea2b0ec23..d79411bfba364c2c93be71e8b999ab45d62e1ec5:/common/lfdemod.c?ds=sidebyside

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 7e31f53d..ff80b8b3 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -84,7 +84,9 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
 			case 3: if (BitStream[j]==1) return 0; break; //should be 0 spacer bit
 			case 2: if (BitStream[j]==0) return 0; break; //should be 1 spacer bit
 			default: //test parity
-				if (parityTest(parityWd, pLen, pType) == 0) return 0; break;
+				if (parityTest(parityWd, pLen, pType) == 0) 
+					return 0; 
+				break;
 		}
 		bitCnt+=(pLen-1);
 		parityWd = 0;
@@ -148,8 +150,11 @@ uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits)
 //search for given preamble in given BitStream and return success=1 or fail=0 and startIndex and length
 uint8_t preambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t *size, size_t *startIdx)
 {
-	uint8_t foundCnt=0;
-	for (int idx=0; idx < *size - pLen; idx++){
+	// Sanity check.  If preamble length is bigger than bitstream length.
+	if ( *size <= pLen ) return 0;
+	
+	uint8_t foundCnt = 0;
+	for (int idx = 0; idx < *size - pLen; idx++){
 		if (memcmp(BitStream+idx, preamble, pLen) == 0){
 			//first index found
 			foundCnt++;