[Scummvm-git-logs] scummvm master -> 25cf429e3fd4784e01a761980c46b32aa52dc32c

[scemino]

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

Summary:
35db8b2cb9 DIRECTOR: Fix issue when collapsing ImGui windows
57b3f0743a DIRECTOR: Fix bad bit shift operation in showCast.
25cf429e3f DIRECTOR: Fix out-of-bounds read in debug tools.


Commit: 35db8b2cb9a4de598aec31a41c48c5f0d5e133e3
    https://github.com/scummvm/scummvm/commit/35db8b2cb9a4de598aec31a41c48c5f0d5e133e3
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-06T09:34:44+02:00

Commit Message:
DIRECTOR: Fix issue when collapsing ImGui windows

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 0d82f310a1e..2e33ed188a4 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -487,8 +487,8 @@ static void showCast() {
 			ImGui::Spacing();
 			ImGui::SliderInt("Thumbnail Size", &_state->_cast._thumbnailSize, 32, 256);
 		}
-		ImGui::End();
 	}
+	ImGui::End();
 }
 
 static void showVars() {
@@ -738,8 +738,8 @@ static bool showScript(CastMemberID &id) {
 			ImGui::Text("[Nothing]");
 		}
 
-		ImGui::End();
 	}
+	ImGui::End();
 
 	if (!closed)
 		return false;


Commit: 57b3f0743aa1fb5f64a72d33d9e607b1e378af49
    https://github.com/scummvm/scummvm/commit/57b3f0743aa1fb5f64a72d33d9e607b1e378af49
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-06T09:34:44+02:00

Commit Message:
DIRECTOR: Fix bad bit shift operation in showCast.

Coverity CID 1544889

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 2e33ed188a4..f8388678ef2 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -389,7 +389,7 @@ static void showCast() {
 						const char *name = castMemberInfo ? castMemberInfo->name.c_str() : "";
 						if (!_state->_cast._nameFilter.PassFilter(name))
 							continue;
-						if (!(_state->_cast._typeFilter & (1 << (int)castMember._value->_type)))
+						if ((castMember._value->_type != kCastTypeAny) && !(_state->_cast._typeFilter & (1 << (int)castMember._value->_type)))
 							continue;
 
 						ImGui::TableNextRow();
@@ -439,7 +439,7 @@ static void showCast() {
 						}
 						if (!_state->_cast._nameFilter.PassFilter(name.c_str()))
 							continue;
-						if (!(_state->_cast._typeFilter & (1 << (int)castMember._value->_type)))
+						if ((castMember._value->_type != kCastTypeAny) && !(_state->_cast._typeFilter & (1 << (int)castMember._value->_type)))
 							continue;
 
 						ImGui::TableNextColumn();


Commit: 25cf429e3fd4784e01a761980c46b32aa52dc32c
    https://github.com/scummvm/scummvm/commit/25cf429e3fd4784e01a761980c46b32aa52dc32c
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-06T09:34:44+02:00

Commit Message:
DIRECTOR: Fix out-of-bounds read in debug tools.

Coverity CID 1544895

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index f8388678ef2..5209c2ce759 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -226,6 +226,8 @@ static const char *toString(ScriptType scriptType) {
 		"Movie",
 		"Event",
 		"Test",
+		"???",
+		"???",
 		"Parent",
 	};
 	if (scriptType < 0 || scriptType > kMaxScriptType)