[Scummvm-git-logs] scummvm master -> fdfa62794275123a110a13ab78537fac3adbd33a

somaen noreply at scummvm.org
Mon Sep 26 21:48:32 UTC 2022


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

Summary:
fdfa627942 DIRECTOR: Check open() result in AIFF XObj.


Commit: fdfa62794275123a110a13ab78537fac3adbd33a
    https://github.com/scummvm/scummvm/commit/fdfa62794275123a110a13ab78537fac3adbd33a
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2022-09-26T23:47:50+02:00

Commit Message:
DIRECTOR: Check open() result in AIFF XObj.

Fixes COVERITY: 1490060

Changed paths:
    engines/director/lingo/xlibs/aiff.cpp


diff --git a/engines/director/lingo/xlibs/aiff.cpp b/engines/director/lingo/xlibs/aiff.cpp
index fc421306d53..739a47fb696 100644
--- a/engines/director/lingo/xlibs/aiff.cpp
+++ b/engines/director/lingo/xlibs/aiff.cpp
@@ -100,7 +100,9 @@ void AiffXObj::m_duration(int nargs) {
 	Common::replace(filePath, "\\", ":");
 
 	Common::MacResManager macresman;
-	macresman.open(Common::Path(pathMakeRelative(filePath), g_director->_dirSeparator));
+	if (!macresman.open(Common::Path(pathMakeRelative(filePath), g_director->_dirSeparator))) {
+		error("Failed to open %s", filePath.c_str());
+	}
 	auto aiffStream = macresman.getDataFork();
 
 	auto aiffHeader = Audio::AIFFHeader::readAIFFHeader(aiffStream, DisposeAfterUse::YES);




More information about the Scummvm-git-logs mailing list