From 57c8ac1dd9832ff51335341ad9eeb29ff477f062 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Fri, 18 Dec 2020 02:54:59 -0800
Subject: [PATCH] Core: Improve memory handling when deleting a cheat device

---
 src/core/cheats.c | 1 +
 src/gb/core.c     | 1 -
 src/gba/core.c    | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/cheats.c b/src/core/cheats.c
index acd994393..015144022 100644
--- a/src/core/cheats.c
+++ b/src/core/cheats.c
@@ -60,6 +60,7 @@ void mCheatDeviceCreate(struct mCheatDevice* device) {
 void mCheatDeviceDestroy(struct mCheatDevice* device) {
 	mCheatDeviceClear(device);
 	mCheatSetsDeinit(&device->cheats);
+	free(device);
 }
 
 void mCheatDeviceClear(struct mCheatDevice* device) {
diff --git a/src/gb/core.c b/src/gb/core.c
index f0dbac0ba..d6b3fb182 100644
--- a/src/gb/core.c
+++ b/src/gb/core.c
@@ -143,7 +143,6 @@ static void _GBCoreDeinit(struct mCore* core) {
 	if (gbcore->cheatDevice) {
 		mCheatDeviceDestroy(gbcore->cheatDevice);
 	}
-	free(gbcore->cheatDevice);
 	mCoreConfigFreeOpts(&core->opts);
 	free(core);
 }
diff --git a/src/gba/core.c b/src/gba/core.c
index 1df7286ff..2dc34e33a 100644
--- a/src/gba/core.c
+++ b/src/gba/core.c
@@ -234,7 +234,6 @@ static void _GBACoreDeinit(struct mCore* core) {
 	if (gbacore->cheatDevice) {
 		mCheatDeviceDestroy(gbacore->cheatDevice);
 	}
-	free(gbacore->cheatDevice);
 	free(gbacore->audioMixer);
 	mCoreConfigFreeOpts(&core->opts);
 	free(core);