From 0e4f7e9727a8c6698dddc96f9bd7594e0a831fe3 Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Thu, 23 Aug 2018 18:38:05 +0300
Subject: [PATCH] added tlv tree to function

---
 client/emv/cmdemv.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 622ce31b..a4aa29e3 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -300,10 +300,15 @@ int UsageCmdHFEMVExec(void) {
 #define TLV_ADD(tag, value)( tlvdb_add(tlvRoot, tlvdb_fixed(tag, sizeof(value) - 1, (const unsigned char *)value)) )
 #define dreturn(n) {free(pdol_data_tlv);tlvdb_free(tlvSelect);tlvdb_free(tlvRoot);DropField();return n;}
 
-bool ParamLoadFromJson() {
+bool ParamLoadFromJson(struct tlvdb *tlv) {
 	json_t *root;
 	json_error_t error;
 
+	if (!tlv) {
+		PrintAndLog("ERROR load params: tlv tree is NULL.");
+		return false; 
+	}
+
 	// TODO: add search current path
 	root = json_load_file("./emv/defparams.json", 0, &error);
 	if (!root) {
@@ -507,7 +512,7 @@ int CmdHFEMVExec(const char *cmd) {
 	
 	PrintAndLog("\n* Init transaction parameters.");
 
-	ParamLoadFromJson();
+	ParamLoadFromJson(tlvRoot);
 	
 	//9F66:(Terminal Transaction Qualifiers (TTQ)) len:4
 	char *qVSDC = "\x26\x00\x00\x00";