github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 14:13:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed free structures on exit

Browse source
This commit is contained in:
merlokk 2017-12-17 20:48:26 +02:00
commit a2bc3b70a9
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/emv/cmdemv.c
View file

@ -296,7 +296,7 @@ int UsageCmdHFEMVExec(void) {
} }
#define TLV_ADD(tag, value)( tlvdb_add(tlvRoot, tlvdb_fixed(tag, sizeof(value) - 1, (const unsigned char *)value)) ) #define TLV_ADD(tag, value)( tlvdb_add(tlvRoot, tlvdb_fixed(tag, sizeof(value) - 1, (const unsigned char *)value)) )
#define dreturn(n) {DropField();return n;} #define dreturn(n) {free(pdol_data_tlv);tlvdb_free(tlvSelect);tlvdb_free(tlvRoot);DropField();return n;}
int CmdHFEMVExec(const char *cmd) { int CmdHFEMVExec(const char *cmd) {
bool activateField = false; bool activateField = false;
@ -316,6 +316,10 @@ int CmdHFEMVExec(const char *cmd) {
int res; int res;
struct tlvdb *tlvSelect = NULL;
struct tlvdb *tlvRoot = NULL;
struct tlv *pdol_data_tlv = NULL;
if (strlen(cmd) < 1) { if (strlen(cmd) < 1) {
UsageCmdHFEMVExec(); UsageCmdHFEMVExec();
return 0; return 0;
@ -371,7 +375,6 @@ int CmdHFEMVExec(const char *cmd) {
// init applets list tree // init applets list tree
struct tlvdb *tlvSelect = NULL;
const char *al = "Applets list"; const char *al = "Applets list";
tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al); tlvSelect = tlvdb_fixed(1, strlen(al), (const unsigned char *)al);
@ -395,7 +398,6 @@ int CmdHFEMVExec(const char *cmd) {
PrintAndLog("\n* Search AID in list."); PrintAndLog("\n* Search AID in list.");
SetAPDULogging(false); SetAPDULogging(false);
if (EMVSearch(activateField, true, decodeTLV, tlvSelect)) { if (EMVSearch(activateField, true, decodeTLV, tlvSelect)) {
tlvdb_free(tlvSelect);
dreturn(2); dreturn(2);
} }
@ -405,7 +407,6 @@ int CmdHFEMVExec(const char *cmd) {
} }
// Init TLV tree // Init TLV tree
struct tlvdb *tlvRoot = NULL;
const char *alr = "Root terminal TLV tree"; const char *alr = "Root terminal TLV tree";
tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr); tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
@ -474,7 +475,7 @@ int CmdHFEMVExec(const char *cmd) {
TLVPrintFromTLV(tlvRoot); // TODO delete!!! TLVPrintFromTLV(tlvRoot); // TODO delete!!!
PrintAndLog("\n* Calc PDOL."); PrintAndLog("\n* Calc PDOL.");
struct tlv *pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83); pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
if (!pdol_data_tlv){ if (!pdol_data_tlv){
PrintAndLog("ERROR: can't create PDOL TLV."); PrintAndLog("ERROR: can't create PDOL TLV.");
dreturn(4); dreturn(4);