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

[mduggan]

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

Summary:
aec26642e4 ACCESS: Small const correctness fix
e32f0ba272 ACCESS: Fix cast in resource check


Commit: aec26642e46ed799d858ccc878e975ecd01c1db2
    https://github.com/scummvm/scummvm/commit/aec26642e46ed799d858ccc878e975ecd01c1db2
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-09-15T20:32:52+10:00

Commit Message:
ACCESS: Small const correctness fix

Changed paths:
    engines/access/asurface.h


diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 08087c6011f..72ee07a0dfd 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -150,7 +150,7 @@ public:
 	SpriteResource(const AccessEngine *vm, Resource *res);
 	~SpriteResource();
 
-	int getCount() { return _frames.size(); }
+	int getCount() const { return _frames.size(); }
 
 	const SpriteFrame *getFrame(int idx) const { return _frames[idx]; }
 };


Commit: e32f0ba272c3b1a274b63c34e11354acc26ff40f
    https://github.com/scummvm/scummvm/commit/e32f0ba272c3b1a274b63c34e11354acc26ff40f
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-09-15T20:34:15+10:00

Commit Message:
ACCESS: Fix cast in resource check

By casting the input offset value to int, it could accidentally pass the test
by being negative.  Instead, cast the other value to uint32.

Changed paths:
    engines/access/asurface.cpp


diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 1d77533cb6b..bfa1fbafe3e 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -48,7 +48,7 @@ SpriteResource::SpriteResource(const AccessEngine *vm, Resource *res) {
 
 	for (int i = 0; i < count; i++) {
 		uint32 offset = res->_stream->readUint32LE();
-		if ((int)offset > res->_size)
+		if (offset > (uint32)res->_size)
 			error("Corrupt sprite resource: offset %d (%d) is past end of file (%d)", i, offset, res->_size);
 		offsets.push_back(offset);
 	}