[Scummvm-git-logs] scummvm master -> 776875aa01ca8ff01de18c9c1db24316953feef8

[orgads]

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:
776875aa01 SCUMM: Initialize some local variables


Commit: 776875aa01ca8ff01de18c9c1db24316953feef8
    https://github.com/scummvm/scummvm/commit/776875aa01ca8ff01de18c9c1db24316953feef8
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2025-05-14T18:14:52+03:00

Commit Message:
SCUMM: Initialize some local variables

Changed paths:
    engines/scumm/imuse/imuse_player.cpp
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index c30ea236f0d..9c191567626 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -1111,8 +1111,8 @@ void Player::metaEvent(byte type, byte *msg, uint16 len) {
 static void syncWithSerializer(Common::Serializer &s, ParameterFader &pf) {
 	s.syncAsSint16LE(pf.param, VER(17));
 	if (s.isLoading() && s.getVersion() < 116) {
-		int16 start, end;
-		uint32 tt, ct;
+		int16 start = 0, end = 0;
+		uint32 tt = 0, ct = 0;
 		s.syncAsSint16LE(start, VER(17));
 		s.syncAsSint16LE(end, VER(17));
 		s.syncAsUint32LE(tt, VER(17));
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index b8d8feaca98..e553a68d006 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -2374,8 +2374,6 @@ void ScummEngine_v100he::saveLoadWithSerializer(Common::Serializer &s) {
 #endif
 
 void ScummEngine::loadResourceOLD(Common::Serializer &ser, ResType type, ResId idx) {
-	uint32 size;
-
 	if (type == rtSound && ser.getVersion() >= VER(23)) {
 		// Save/load only a list of resource numbers that need to be reloaded.
 		uint16 tmp;
@@ -2383,6 +2381,7 @@ void ScummEngine::loadResourceOLD(Common::Serializer &ser, ResType type, ResId i
 		if (tmp)
 			ensureResourceLoaded(rtSound, idx);
 	} else if (_res->_types[type]._mode == kDynamicResTypeMode) {
+		uint32 size = 0;
 		ser.syncAsUint32LE(size);
 		if (size) {
 			_res->createResource(type, idx, size);
@@ -2426,7 +2425,7 @@ void ScummEngine::saveResource(Common::Serializer &ser, ResType type, ResId idx)
 void ScummEngine::loadResource(Common::Serializer &ser, ResType type, ResId idx) {
 	if (_game.heversion >= 60 && ser.getVersion() <= VER(65) &&
 		((type == rtSound && idx == 1) || (type == rtSpoolBuffer))) {
-		uint32 size;
+		uint32 size = 0;
 		ser.syncAsUint32LE(size);
 		assert(size);
 		_res->createResource(type, idx, size);
@@ -2438,7 +2437,7 @@ void ScummEngine::loadResource(Common::Serializer &ser, ResType type, ResId idx)
 
 		ensureResourceLoaded(rtSound, idx);
 	} else if (_res->_types[type]._mode == kDynamicResTypeMode) {
-		uint32 size;
+		uint32 size = 0;
 		ser.syncAsUint32LE(size);
 		assert(size);
 		byte *ptr = _res->createResource(type, idx, size);