Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	armsrc/mifarecmd.c
	client/cmdhfmf.c

diff --cc armsrc/mifarecmd.c
index 9c17ce3cb3490b066a1f6c65d4c71d084604d256,8355cd1946172da7c7cdf272938179bc95fef66a..ff9fb16a786ca20f441bb8776309f2b398ef655e
--- 1/armsrc/mifarecmd.c
--- 2/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@@ -332,11 -335,9 +332,11 @@@ void MifareUReadCard(uint8_t arg0, uint
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
  \r
        countblocks *= 4;\r
-       cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(),0 , 0);\r
+       cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 +      \r
 +      BigBuf_free();\r
  }\r
  \r
  //-----------------------------------------------------------------------------\r

diff --cc client/cmdhfmf.c
index 94c4707206273e9fd8c25997a023db18560a944b,2b5a5b87965dd7b36e283e9f94fe876f2e740dc7..eb2479ff26308f61f5f5842b3c109b447a4747fa
--- 1/client/cmdhfmf.c
--- 2/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -1326,8 -1311,8 +1326,9 @@@ int CmdHF14AMfESave(const char *Cmd
                }\r
                else {\r
                        for (j = 0; j < 7; j++, fnameptr += 2)\r
-                               sprintf(fnameptr, "%02X", buf[j]); \r
+                               sprintf(fnameptr, "%02X", buf[j]);\r
+               }\r
 +              }\r
        } else {\r
                fnameptr += len;\r
        }\r