X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ec187c2f9fffe03711d0e3039ee8ffe0a27331c8..9331855865a6e4079186a91a57245b1fe7700a38:/common/lfdemod.c

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 5a1007fb..eb84203e 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -308,15 +308,17 @@ uint32_t manchesterEncode2Bytes(uint16_t datain) {
 
 //by marshmellow
 //encode binary data into binary manchester 
-//NOTE: BitStream must have double the size available in memory to do the swap
+//NOTE: BitStream must have triple the size of "size" available in memory to do the swap
 int ManchesterEncode(uint8_t *BitStream, size_t size) {
-	size_t modIdx=size, i=0;
-	if (size>modIdx) return -1;
+	//allow up to 4K out (means BitStream must be at least 2048+4096 to handle the swap)
+	size = (size>2048) ? 2048 : size;
+	size_t modIdx = size;
+	size_t i;
 	for (size_t idx=0; idx < size; idx++){
 		BitStream[idx+modIdx++] = BitStream[idx];
 		BitStream[idx+modIdx++] = BitStream[idx]^1;
 	}
-	for (; i<(size*2); i++){
+	for (i=0; i<(size*2); i++){
 		BitStream[i] = BitStream[i+size];
 	}
 	return i;
@@ -1701,6 +1703,8 @@ int FDXBdemodBI(uint8_t *dest, size_t *size) {
 
 	uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
 	if (errChk == 0) return -2; //preamble not found
+	if (*size != 128) return -3; //wrong size for fdxb
+	//return start position
 	return (int)startIdx;
 }