From: Martin Holst Swende <martin@swende.se>
Date: Sun, 24 May 2015 05:22:09 +0000 (+0200)
Subject: Merge pull request #102 from marshmellow42/master
X-Git-Tag: v2.1.0~11
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f0eaac9aca504fd2386291ddced1955fc001ea5b?hp=86724c17c9914f495e2a7df729d4fe65a9746d82

Merge pull request #102 from marshmellow42/master

fix mfu dump getbigbuffer bug
---

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 0586a25d..8355cd19 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -335,7 +335,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
 
 	countblocks *= 4;
-	cmd_send(CMD_ACK, 1, countblocks, countblocks, 0, 0);
+	cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
 }
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 07c379bc..19103298 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1106,12 +1106,13 @@ int CmdHF14AMfUDump(const char *Cmd){
 		return 1;
 	}
 
+	uint32_t startindex = resp.arg[2];
 	uint32_t bufferSize = resp.arg[1];
 	if (bufferSize > sizeof(data)) {
 		PrintAndLog("Data exceeded Buffer size!");
 		bufferSize = sizeof(data);
 	}
-	GetFromBigBuf(data, bufferSize, 0);
+	GetFromBigBuf(data, bufferSize, startindex);
 	WaitForResponse(CMD_ACK,NULL);
 
 	Pages = bufferSize/4;