[Scummvm-git-logs] scummvm master -> 39f57e021b07c9f20f7739a6393ad89ba342a604

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
39f57e021b ACCESS: Avoid double-free on Noctropolis vid audio


Commit: 39f57e021b07c9f20f7739a6393ad89ba342a604
    https://github.com/scummvm/scummvm/commit/39f57e021b07c9f20f7739a6393ad89ba342a604
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-06-12T09:29:14+10:00

Commit Message:
ACCESS: Avoid double-free on Noctropolis vid audio

Quitting the game when a video is in the stopped state causes close to be
called twice.  Clear the stream pointer so we don't try to double-free it.

Changed paths:
    engines/access/video.cpp


diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 56979a14830..403b20b809a 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -490,6 +490,8 @@ void VideoPlayer_v2::closeVideo() {
 	if (_audioStream) {
 		_audioStream->finish();
 		_vm->_mixer->stopHandle(_audioStreamHandle);
+		// stream is freed by the mixer.
+		_audioStream = nullptr;
 	}
 	delete _frame;
 	_frame = nullptr;