From 59e444ed72133bf246de571f9b4518e3cc85772f Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Thu, 15 Nov 2018 18:48:25 +1100
Subject: [PATCH] fix

---
 src/ErrorHandler.c | 21 ++++++++++++---------
 src/Program.c      |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/ErrorHandler.c b/src/ErrorHandler.c
index 1413e088b..6b95b88df 100644
--- a/src/ErrorHandler.c
+++ b/src/ErrorHandler.c
@@ -268,22 +268,25 @@ void ErrorHandler_Fail2(ReturnCode result, const char* raw_msg) {
 *-------------------------------------------------------Info dumping------------------------------------------------------*
 *#########################################################################################################################*/
 static void ErrorHandler_Backtrace(String* backtrace_, void* ctx) {
+	String str; char strBuffer[STRING_SIZE * 5];
 	void* addrs[40];
-	int i, frames = backtrace(addrs, 40);
-	char** strings = backtrace_symbols(addrs, frames);
+	int i, frames, num;
+	char** strings;
+	uintptr_t addr;
+
+	frames  = backtrace(addrs, 40);
+	strings = backtrace_symbols(addrs, frames);
 
 	for (i = 0; i < frames; i++) {
-		int number = i + 1;
-		uintptr_t addr = (uintptr_t)addrs[i];
-
-		char strBuffer[STRING_SIZE * 5];
-		String str = String_FromArray(strBuffer);
+		num  = i + 1;
+		addr = (uintptr_t)addrs[i];
+		String_InitArray(str, strBuffer);
 
 		/* instruction pointer */
 		if (strings && strings[i]) {
-			String_Format3(&str, "%i) 0x%x - %c\n", &number, &addr, strings[i]);
+			String_Format3(&str, "%i) 0x%x - %c\n", &num, &addr, strings[i]);
 		} else {
-			String_Format2(&str, "%i) 0x%x\n", &number, &addr);
+			String_Format2(&str, "%i) 0x%x\n", &num, &addr);
 		}
 
 		String_AppendString(backtrace_, &str);
diff --git a/src/Program.c b/src/Program.c
index a69898e09..4a22760cd 100644
--- a/src/Program.c
+++ b/src/Program.c
@@ -52,8 +52,8 @@ int main(int argc, char** argv) {
 
 	argsCount = Platform_GetCommandLineArgs(argc, argv, args);
 	/* NOTE: Make sure to comment this out before pushing a commit */
-	String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565"); 
-	argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4); 
+	/* String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565"); */
+	/* argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4); */
 
 	Platform_SetWorkingDir();
 	ErrorHandler_Init();