NUVIE: Fix Ultima 6 crash on FM-Towns sound load #4931
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
U6Lib_n::close(): Do not call close() on NuvieIO buffers passed to us
via U6Lib_n::open(). Let the caller handle this instead.
Prevents a crash caused by the following events:
The game detects the files of the FM-Towns version
("townsu6" in the game directory) and eventually attempts to load
"sounds1.dat" in TownsSfxManager::loadSound1Dat()
Here, it creates local objects U6Lib_n "lib" and NuvieIOBuffer "iobuf"
File data is loaded into "iobuf", which is then passed to "lib" via
pointer. This pointer is stored by "lib"
When TownsSfxManager::loadSound1Dat() returns, "iobuf" goes out of
scope and is destroyed before "lib"
The destructor of "lib" tries to call close() via the stale pointer,
thus causing the crash
Fixes #14429