From 13dd9f59cf5c87f5b75c14524ffc9261b03c22f7 Mon Sep 17 00:00:00 2001
From: Chris Thrasher <chrisjthrasher@gmail.com>
Date: Sun, 22 Oct 2023 23:37:02 -0500
Subject: [PATCH] Manage memory with higher level constructs

---
 src/SFML/Main/MainAndroid.cpp        | 6 +++---
 src/SFML/System/Android/Activity.hpp | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/SFML/Main/MainAndroid.cpp b/src/SFML/Main/MainAndroid.cpp
index 3378c3580..f424d23bc 100644
--- a/src/SFML/Main/MainAndroid.cpp
+++ b/src/SFML/Main/MainAndroid.cpp
@@ -500,9 +500,9 @@ JNIEXPORT void ANativeActivity_onCreate(ANativeActivity* activity, void* savedSt
 
     if (savedState != nullptr)
     {
-        states->savedState     = std::malloc(savedStateSize);
-        states->savedStateSize = savedStateSize;
-        std::memcpy(states->savedState, savedState, savedStateSize);
+        const auto* begin = static_cast<const std::byte*>(savedState);
+        const auto* end   = begin + savedStateSize;
+        states->savedState.assign(begin, end);
     }
 
     states->mainOver = false;
diff --git a/src/SFML/System/Android/Activity.hpp b/src/SFML/System/Android/Activity.hpp
index 8a391719e..7d981cb8f 100644
--- a/src/SFML/System/Android/Activity.hpp
+++ b/src/SFML/System/Android/Activity.hpp
@@ -39,6 +39,8 @@
 #include <unordered_map>
 #include <vector>
 
+#include <cstddef>
+
 class SFML_SYSTEM_API LogcatStream : public std::streambuf
 {
 public:
@@ -64,8 +66,7 @@ struct ActivityStates
     EGLDisplay  display{};
     EglContext* context{};
 
-    void*       savedState{};
-    std::size_t savedStateSize{};
+    std::vector<std::byte> savedState;
 
     std::recursive_mutex mutex;