From e8d15d0c1847b5fd40c439ba3e70e6b5cc49193c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Mar 2019 20:47:57 +0100
Subject: [PATCH] FIX: 'data load' - now loads large files again (TITEST.txt)

---
 client/cmddata.c | 12 +++++++-----
 client/graph.c   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 6d83a4e0b..45bce9c9c 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1600,19 +1600,23 @@ int CmdLoad(const char *Cmd) {
 	len = strlen(Cmd);
 	if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
 	memcpy(filename, Cmd, len);
-
+	
 	FILE *f = fopen(filename, "r");
 	if (!f) {
 		PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
 		return 0;
 	}
-
+        
 	GraphTraceLen = 0;
 	char line[80];
 	while (fgets(line, sizeof (line), f)) {
 		GraphBuffer[GraphTraceLen] = atoi(line);
 		GraphTraceLen++;
+    
+        if ( GraphTraceLen >= MAX_GRAPH_TRACE_LEN )
+            break;
 	}
+    
 	if (f)
 		fclose(f);
 
@@ -1620,11 +1624,9 @@ int CmdLoad(const char *Cmd) {
 
 	uint8_t bits[GraphTraceLen];
 	size_t size = getFromGraphBuf(bits);
-	// set signal properties low/high/mean/amplitude and is_noise detection
+    
 	removeSignalOffset(bits, size);
-	// push it back to graph
 	setGraphBuf(bits, size);
-	// set signal properties low/high/mean/amplitude and is_noise detection
 	computeSignalProperties(bits, size);
 
 	setClockGrid(0,0);
diff --git a/client/graph.c b/client/graph.c
index c3f6a2b99..2df0d8202 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -67,7 +67,7 @@ void setGraphBuf(uint8_t *buf, size_t size) {
 	if ( size > MAX_GRAPH_TRACE_LEN )
 		size = MAX_GRAPH_TRACE_LEN;
 
-	for (uint16_t i = 0; i < size; ++i)
+	for (uint32_t i = 0; i < size; ++i)
 		GraphBuffer[i] = buf[i] - 128;
 
 	GraphTraceLen = size;