mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 21:33:47 -07:00
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
This commit is contained in:
commit
f13c0740ec
1 changed files with 9 additions and 0 deletions
|
@ -3048,10 +3048,16 @@ int pm3_load_dump(const char *fn, void **pdump, size_t *dumplen, size_t maxdumpl
|
||||||
switch (dt) {
|
switch (dt) {
|
||||||
case BIN: {
|
case BIN: {
|
||||||
res = loadFile_safe(fn, ".bin", pdump, dumplen);
|
res = loadFile_safe(fn, ".bin", pdump, dumplen);
|
||||||
|
if (res == PM3_SUCCESS && *dumplen > maxdumplen) {
|
||||||
|
*dumplen = maxdumplen;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case EML: {
|
case EML: {
|
||||||
res = loadFileEML_safe(fn, pdump, dumplen);
|
res = loadFileEML_safe(fn, pdump, dumplen);
|
||||||
|
if (res == PM3_SUCCESS && *dumplen > maxdumplen) {
|
||||||
|
*dumplen = maxdumplen;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JSON: {
|
case JSON: {
|
||||||
|
@ -3080,6 +3086,9 @@ int pm3_load_dump(const char *fn, void **pdump, size_t *dumplen, size_t maxdumpl
|
||||||
}
|
}
|
||||||
case MCT: {
|
case MCT: {
|
||||||
res = loadFileMCT_safe(fn, pdump, dumplen);
|
res = loadFileMCT_safe(fn, pdump, dumplen);
|
||||||
|
if (res == PM3_SUCCESS && *dumplen > maxdumplen) {
|
||||||
|
*dumplen = maxdumplen;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case FLIPPER: {
|
case FLIPPER: {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue