[Scummvm-git-logs] scummvm master -> 18b42af0ac4db67e39beccb33ea22534885f81ea

rvanlaar noreply at scummvm.org
Fri Oct 7 11:25:09 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:
18b42af0ac DIRECTOR: Fix dereference null return value


Commit: 18b42af0ac4db67e39beccb33ea22534885f81ea
    https://github.com/scummvm/scummvm/commit/18b42af0ac4db67e39beccb33ea22534885f81ea
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-10-07T13:25:02+02:00

Commit Message:
DIRECTOR: Fix dereference null return value

Check if castMember is not a nullptr before using it.

Fixes COVERITY: 1487660

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 2f7678b85b1..a72cfb618c6 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1820,6 +1820,10 @@ void LB::b_duplicate(int nargs) {
 
 	Frame *currentFrame = score->_frames[score->getCurrentFrame()];
 	CastMember *castMember = movie->getCastMember(from.asMemberID());
+	if (!castMember) {
+		warning("LB::b_duplicate: source cast member doesn't exist");
+		return;
+	}
 	auto channels = score->_channels;
 
 	castMember->setModified(true);




More information about the Scummvm-git-logs mailing list