try fix use after free

sthalik · Dec 23, 2023 · 519ae07 · 519ae07
1 parent 3659132
commit 519ae07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/loader/error-tex.cpp b/loader/error-tex.cpp
@@ -12,8 +12,7 @@ Trade::ImageData2D loader_impl::make_error_texture(Vector2ui size)
     fm_assert(size.product() != 0);
     constexpr auto magenta = Vector4ub{255, 0, 255, 255};
     auto array = Array<Vector4ub>{DirectInit, size.product(), magenta};
-    auto img = Trade::ImageData2D{PixelFormat::RGBA8Unorm, Vector2i(size), {},
-                                  std::move(array), {}, {}};
+    auto img = Trade::ImageData2D{PixelFormat::RGBA8Unorm, Vector2i(size), {}, std::as_const(array), {}, {}};
     return img;
 }
 

diff --git a/loader/wall-atlas.cpp b/loader/wall-atlas.cpp
@@ -60,6 +60,7 @@ const wall_info& loader_impl::make_invalid_wall_atlas()
 
     constexpr auto name = "<invalid>"_s;
     constexpr auto frame_size = Vector2ui{iTILE_SIZE.x(), iTILE_SIZE.z()};
+    auto tex = make_error_texture(frame_size);
 
     auto a = std::make_shared<class wall_atlas>(
         wall_atlas_def {
@@ -68,7 +69,7 @@ const wall_info& loader_impl::make_invalid_wall_atlas()
             {{ {.index = 0, .count = 1, .pixel_size = frame_size, .is_defined = true, } } },
             {{ {.val = 0}, {}, }},
             {1u},
-        }, name, make_error_texture(frame_size));
+        }, name, std::move(tex));
     invalid_wall_atlas = Pointer<wall_info>{InPlaceInit, wall_info{ .name = name, .atlas = std::move(a) } };
     return *invalid_wall_atlas;
 }