From c7b89b8e564885c20ede453dc9fbea7c916def7c Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Thu, 24 Sep 2026 20:59:18 -0400
Subject: [PATCH] small cleanups

---
 lib/controllers/client.dart        | 20 +++++++++++++-------
 lib/helpers/hooks/chat_scroll.dart |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/controllers/client.dart b/lib/controllers/client.dart
index c783f0f..7926afe 100644
--- a/lib/controllers/client.dart
+++ b/lib/controllers/client.dart
@@ -57,10 +57,13 @@ class ClientController extends AsyncNotifier<int> {
       for (final MapEntry(:key, :value) in env.entries) {
         final keyPtr = key.toNativeUtf8().cast<Char>();
         final valuePtr = value.toNativeUtf8().cast<Char>();
-        GomuksSetEnv(keyPtr, valuePtr);
-        calloc
-          ..free(keyPtr)
-          ..free(valuePtr);
+        try {
+          GomuksSetEnv(keyPtr, valuePtr);
+        } finally {
+          calloc
+            ..free(keyPtr)
+            ..free(valuePtr);
+        }
       }
     }
 
@@ -76,7 +79,9 @@ class ClientController extends AsyncNotifier<int> {
       try {
         return GomuksInit(bufferPointer.ref);
       } finally {
-        calloc.free(bufferPointer);
+        calloc
+          ..free(bufferPointer)
+          ..free(bufferPointer.ref.base);
       }
     });
 
@@ -107,8 +112,9 @@ class ClientController extends AsyncNotifier<int> {
 
       return json;
     } finally {
-      calloc.free(bufferPointer.ref.base);
-      calloc.free(bufferPointer);
+      calloc
+        ..free(bufferPointer.ref.base)
+        ..free(bufferPointer);
     }
   }
 
diff --git a/lib/helpers/hooks/chat_scroll.dart b/lib/helpers/hooks/chat_scroll.dart
index 54dd967..4253aee 100644
--- a/lib/helpers/hooks/chat_scroll.dart
+++ b/lib/helpers/hooks/chat_scroll.dart
@@ -71,7 +71,7 @@ final class ChatScroll<T>({
         if (position.extentAfter <= topThreshold) {
           await loadOlder();
         } else if (position.extentBefore <= bottomThreshold) {
-          onReachedBottom();
+          await onReachedBottom();
         }
       }