From 4edfaeead4e81aa1e27741d9736cd1de50a1610c Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Sat, 16 Apr 2022 16:38:09 -0400
Subject: [PATCH] More Fixes

---
 dependencies/glfw/src               | 2 +-
 dependencies/zlib/src               | 2 +-
 docs/CHANGELOG.md                   | 1 +
 launcher/src/bootstrap.c            | 2 ++
 libreborn/src/util/exec.c           | 2 +-
 mods/src/misc/misc.c                | 2 +-
 symbols/include/symbols/minecraft.h | 2 +-
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dependencies/glfw/src b/dependencies/glfw/src
index 955fbd9d2..4cb36872a 160000
--- a/dependencies/glfw/src
+++ b/dependencies/glfw/src
@@ -1 +1 @@
-Subproject commit 955fbd9d265fa95adf9cb94896eb9a516aa50420
+Subproject commit 4cb36872a5fe448c205d0b46f0e8c8b57530cfe0
diff --git a/dependencies/zlib/src b/dependencies/zlib/src
index cacf7f1d4..21767c654 160000
--- a/dependencies/zlib/src
+++ b/dependencies/zlib/src
@@ -1 +1 @@
-Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f
+Subproject commit 21767c654d31d2dccdde4330529775c6c5fd5389
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8c8318c23..783289fc7 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 **2.3.4**
+* AppImage Fixes
 * Make Death Messages Customizable Server-Side
 * Fix Q-Key Behavior Behavior When Editing Signs
 * Add ``Force Touch Inventory`` Feature Flag (Disabled By Default)
diff --git a/launcher/src/bootstrap.c b/launcher/src/bootstrap.c
index 23fa5cbc3..103f0fe5c 100644
--- a/launcher/src/bootstrap.c
+++ b/launcher/src/bootstrap.c
@@ -152,6 +152,8 @@ void pre_bootstrap() {
     if (owd != NULL && chdir(owd) != 0) {
         ERR("AppImage: Unable To Fix Current Directory: %s", strerror(errno));
     }
+    // AppImageCrafters/AppRun#53
+    set_and_print_env("APPDIR_FORCE_BUNDLE_RUNTIME", "1");
 #endif
 
     // Get Binary Directory
diff --git a/libreborn/src/util/exec.c b/libreborn/src/util/exec.c
index 34ec43e5e..66127127d 100644
--- a/libreborn/src/util/exec.c
+++ b/libreborn/src/util/exec.c
@@ -100,7 +100,7 @@ char *run_command(const char *const command[], int *return_code) {
         size_t bytes_read = 0;
         while ((bytes_read = read(output_pipe[0], (void *) buf, BUFFER_SIZE - 1 /* Account For NULL-Terminator */)) > 0) {
             buf[bytes_read] = '\0';
-            string_append(&output, buf);
+            string_append(&output, "%s", buf);
         }
         close(output_pipe[0]);
 
diff --git a/mods/src/misc/misc.c b/mods/src/misc/misc.c
index 98a3d451c..beca6ae3e 100644
--- a/mods/src/misc/misc.c
+++ b/mods/src/misc/misc.c
@@ -92,7 +92,7 @@ static void LoginPacket_read_injection(unsigned char *packet, unsigned char *bit
 // formatting functionality.
 static unsigned char *RakNet_RakString_injection(unsigned char *rak_string, const char *format, ...) {
     // Call Original Method
-    return (*RakNet_RakString)(rak_string, format);
+    return (*RakNet_RakString)(rak_string, "%s", format);
 }
 
 // Print Error Message If RakNet Startup Fails
diff --git a/symbols/include/symbols/minecraft.h b/symbols/include/symbols/minecraft.h
index 9de311a4d..e29954522 100644
--- a/symbols/include/symbols/minecraft.h
+++ b/symbols/include/symbols/minecraft.h
@@ -437,7 +437,7 @@ static PerfRenderer_debugFpsMeterKeyPress_t PerfRenderer_debugFpsMeterKeyPress =
 
 // TextEditScreen
 
-#define TEXT_EDIT_SCREEN_SIZE 0xd0
+#define TEXT_EDIT_SCREEN_SIZE 0xa9
 
 typedef unsigned char *(*TextEditScreen_t)(unsigned char *text_edit_screen, unsigned char *sign);
 static TextEditScreen_t TextEditScreen = (TextEditScreen_t) 0x3a840;