From 44f031d89b9e33338916aeefddb94c3b494a47af Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 23 Mar 2021 19:35:01 -0700
Subject: [PATCH] Core: Fix destroying an mVL with an invalid channel count

---
 CHANGES                    | 1 +
 src/feature/video-logger.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index ed26487db..8af49da37 100644
--- a/CHANGES
+++ b/CHANGES
@@ -76,6 +76,7 @@ Other fixes:
  - Core: Ensure ELF regions can be written before trying
  - Core: Fix threading improperly setting paused state while interrupted
  - Core: Fix loading ELF files that have unexpected empty program headers
+ - Core: Fix destroying an mVL with an invalid channel count
  - Debugger: Don't skip undefined instructions when debugger attached
  - Debugger: Close trace log when done tracing
  - Debugger: Fix change watchpoints (fixes mgba.io/i/1947)
diff --git a/src/feature/video-logger.c b/src/feature/video-logger.c
index b01e1c55d..ae2fa046e 100644
--- a/src/feature/video-logger.c
+++ b/src/feature/video-logger.c
@@ -613,6 +613,7 @@ bool _readHeader(struct mVideoLogContext* context) {
 
 	LOAD_32LE(context->nChannels, 0, &header.nChannels);
 	if (context->nChannels > mVL_MAX_CHANNELS) {
+		context->nChannels = 0;
 		return false;
 	}