Merge pull request #56 from apple1417/master

prevent setting struct/arrays to themselves, don't consider `Undefine` a pre-existing console key

Author: apple1417

changelog.md

@@ -39,6 +39,15 @@
   [bebaeab4](https://github.com/bl-sdk/unrealsdk/commit/bebaeab4)
 
 
+- Trying to set a struct, array, or multicast delegate to itself is now a no-op, and prints a
+  warning.
+
+  [8a98db1f](https://github.com/bl-sdk/unrealsdk/commit/8a98db1f)
+
+- The console key will now also be overwritten if it was previously set to `Undefine`.
+
+  [631fa41e](https://github.com/bl-sdk/unrealsdk/commit/631fa41e)
+
 ## v1.4.0
 - Fixed that UE3 `WeakPointer`s would always return null, due to an incorrect offset in the
   `UObject` header layout.

src/unrealsdk/game/bl2/console.cpp

@@ -271,7 +271,7 @@ bool inject_console_hook(hook_manager::Details& hook) {
     console_output_text = console->get<UFunction, BoundFunction>(L"OutputTextLine"_fn);
 
     auto existing_console_key = console->get<UNameProperty>(L"ConsoleKey"_fn);
-    if (existing_console_key != L"None"_fn || existing_console_key == L"Undefine"_fn) {
+    if (existing_console_key != L"None"_fn && existing_console_key != L"Undefine"_fn) {
         LOG(MISC, "Console key is already set to '{}'", existing_console_key);
     } else {
         std::string wanted_console_key{config::get_str("unrealsdk.console_key").value_or("Tilde")};

src/unrealsdk/game/bl3/console.cpp

@@ -195,7 +195,7 @@ bool inject_console_hook(hook_manager::Details& hook) {
             inner_obj->get<UStructProperty>(L"ConsoleKey"_fn).get<UNameProperty>(L"KeyName"_fn);
         FName console_key{0, 0};
 
-        if (existing_console_key != L"None"_fn || existing_console_key == L"Undefine"_fn) {
+        if (existing_console_key != L"None"_fn && existing_console_key != L"Undefine"_fn) {
             LOG(MISC, "Console key is already set to {}", existing_console_key);
 
             console_key = existing_console_key;

src/unrealsdk/unreal/classes/properties/uarrayproperty.cpp

@@ -41,9 +41,14 @@ void PropTraits<UArrayProperty>::set(const UArrayProperty* prop,
                                  + (std::string)inner->Name);
     }
 
-    cast(inner, [prop, addr, &value]<typename T>(const T* inner) {
-        auto arr = reinterpret_cast<TArray<void>*>(addr);
+    auto arr = reinterpret_cast<TArray<void>*>(addr);
+    if (arr->data != nullptr && arr->data == value.base.get()->data) {
+        LOG(DEV_WARNING, L"Refusing to set array property {} to itself, at address {:p}",
+            prop->get_path_name(), reinterpret_cast<void*>(addr));
+        return;
+    }
 
+    cast(inner, [prop, &arr, &value]<typename T>(const T* inner) {
         auto new_size = value.size();
         arr->resize(new_size, prop->ElementSize);
 

src/unrealsdk/unreal/classes/properties/umulticastdelegateproperty.cpp

@@ -28,10 +28,17 @@ void PropTraits<UMulticastDelegateProperty>::set(const UMulticastDelegatePropert
                                  + (std::string)prop->get_signature()->Name);
     }
 
+    auto arr = reinterpret_cast<TArray<FScriptDelegate>*>(addr);
+    if (arr->data != nullptr && arr->data == value.base.get()->data) {
+        LOG(DEV_WARNING,
+            L"Refusing to set multicast delegate property {} to itself, at address {:p}",
+            prop->get_path_name(), reinterpret_cast<void*>(addr));
+        return;
+    }
+
     // Can just memcpy the array contents
     static_assert(std::is_trivially_copyable_v<FScriptDelegate>);
 
-    auto arr = reinterpret_cast<TArray<FScriptDelegate>*>(addr);
     arr->resize(value.base->size());
     memcpy(arr->data, value.base->data, value.base->size() * sizeof(*arr->data));
 }

src/unrealsdk/unreal/wrappers/wrapped_struct.cpp

@@ -11,6 +11,12 @@
 namespace unrealsdk::unreal {
 
 void copy_struct(uintptr_t dest, const WrappedStruct& src) {
+    if (dest == reinterpret_cast<uintptr_t>(src.base.get())) {
+        LOG(DEV_WARNING, "Refusing to copy struct of type {} to itself, at address {:p}",
+            src.type->Name, src.base.get());
+        return;
+    }
+
     for (const auto& prop : src.type->properties()) {
         cast(prop, [dest, &src]<typename T>(const T* prop) {
             for (size_t i = 0; i < (size_t)prop->ArrayDim; i++) {