aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Talavera <jesse@jesse.tg>2023-12-15 18:05:43 -0500
committerGitHub <noreply@github.com>2023-12-16 00:05:43 +0100
commit1bec2a92935d7cb2e47088d00d89b69f25c82967 (patch)
treef330415f9f4e2b8e6b8f0efeb21d617c36b69979
parenteedb0ba478dea7ffebd347a37acdbf19b095066b (diff)
Fix an incorrect use of `std::move` (#1919)
- When I adapted `GBACart::ParseROM` to use `unique_ptr` instead of a plain pointer, I forgot to remove the code that copied the SRAM data - That code was made unnecessary because of the move
-rw-r--r--src/GBACart.cpp22
1 files changed, 2 insertions, 20 deletions
diff --git a/src/GBACart.cpp b/src/GBACart.cpp
index 826444b..37fa044 100644
--- a/src/GBACart.cpp
+++ b/src/GBACart.cpp
@@ -755,24 +755,6 @@ std::unique_ptr<CartCommon> ParseROM(std::unique_ptr<u8[]>&& romdata, u32 romlen
auto [cartrom, cartromsize] = PadToPowerOf2(std::move(romdata), romlen);
- std::unique_ptr<u8[]> cartsram;
- try
- {
- cartsram = std::move(sramdata) ? std::make_unique<u8[]>(sramlen) : nullptr;
- }
- catch (const std::bad_alloc& e)
- {
- Log(LogLevel::Error, "GBACart: failed to allocate memory for ROM (%d bytes)\n", cartromsize);
-
- return nullptr;
- }
-
- if (cartsram)
- {
- memset(cartsram.get(), 0, sramlen);
- memcpy(cartsram.get(), sramdata.get(), sramlen);
- }
-
char gamecode[5] = { '\0' };
memcpy(&gamecode, cartrom.get() + 0xAC, 4);
@@ -790,9 +772,9 @@ std::unique_ptr<CartCommon> ParseROM(std::unique_ptr<u8[]>&& romdata, u32 romlen
std::unique_ptr<CartCommon> cart;
if (solarsensor)
- cart = std::make_unique<CartGameSolarSensor>(std::move(cartrom), cartromsize, std::move(cartsram), sramlen);
+ cart = std::make_unique<CartGameSolarSensor>(std::move(cartrom), cartromsize, std::move(sramdata), sramlen);
else
- cart = std::make_unique<CartGame>(std::move(cartrom), cartromsize, std::move(cartsram), sramlen);
+ cart = std::make_unique<CartGame>(std::move(cartrom), cartromsize, std::move(sramdata), sramlen);
cart->Reset();