From a2bc3b70a9bab0e08383253df21a95874f869352 Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Sun, 17 Dec 2017 20:48:26 +0200
Subject: [PATCH] fixed free structures on exit

---
 client/emv/cmdemv.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 921de1c8..3d4b0c1a 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -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 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) {
 	bool activateField = false;
@@ -316,6 +316,10 @@ int CmdHFEMVExec(const char *cmd) {
 	
 	int res;
 	
+	struct tlvdb *tlvSelect = NULL;
+	struct tlvdb *tlvRoot = NULL;
+	struct tlv *pdol_data_tlv = NULL;
+
 	if (strlen(cmd) < 1) {
 		UsageCmdHFEMVExec();
 		return 0;
@@ -371,7 +375,6 @@ int CmdHFEMVExec(const char *cmd) {
 
 	
 	// init applets list tree
-	struct tlvdb *tlvSelect = NULL;
 	const char *al = "Applets list";
 	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.");
 		SetAPDULogging(false);
 		if (EMVSearch(activateField, true, decodeTLV, tlvSelect)) {
-			tlvdb_free(tlvSelect);
 			dreturn(2);
 		}
 
@@ -405,7 +407,6 @@ int CmdHFEMVExec(const char *cmd) {
 	}
 	
 	// Init TLV tree
-	struct tlvdb *tlvRoot = NULL;
 	const char *alr = "Root terminal TLV tree";
 	tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 	
@@ -474,7 +475,7 @@ int CmdHFEMVExec(const char *cmd) {
 	TLVPrintFromTLV(tlvRoot); // TODO delete!!!
 	
 	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){
 		PrintAndLog("ERROR: can't create PDOL TLV.");
 		dreturn(4);