[Scummvm-git-logs] scummvm master -> 37ff2f2a3f72405341a94a57ee738db757d4c6b8

[sev-]

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:
00cbde7ed9 ICB: Add missing va_end(). CID 1433521
c7f3554b40 HPL1: Avoid side effect in assert(). CID 1501715
37ff2f2a3f ICB: Fix infinite loop. CID 1433458


Commit: 00cbde7ed9fe3aeacb6d3d83b41cde642cf62902
    https://github.com/scummvm/scummvm/commit/00cbde7ed9fe3aeacb6d3d83b41cde642cf62902
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-23T17:54:25+02:00

Commit Message:
ICB: Add missing va_end(). CID 1433521

Changed paths:
    engines/icb/actor_view_pc.cpp


diff --git a/engines/icb/actor_view_pc.cpp b/engines/icb/actor_view_pc.cpp
index 3b1137b86a2..97a9fde5bcd 100644
--- a/engines/icb/actor_view_pc.cpp
+++ b/engines/icb/actor_view_pc.cpp
@@ -677,6 +677,9 @@ int32 my_sprintf(char *buf, const char *format...) {
 
 	strncpy(buf, lbuf, slen);
 	buf[slen] = '\0';
+
+	va_end(arglist);
+
 	return slen;
 }
 


Commit: c7f3554b406df07b9d602ea99158dd5ddfeb270e
    https://github.com/scummvm/scummvm/commit/c7f3554b406df07b9d602ea99158dd5ddfeb270e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-23T18:03:29+02:00

Commit Message:
HPL1: Avoid side effect in assert(). CID 1501715

Changed paths:
    engines/hpl1/engine/ai/AINodeGenerator.cpp


diff --git a/engines/hpl1/engine/ai/AINodeGenerator.cpp b/engines/hpl1/engine/ai/AINodeGenerator.cpp
index 24f1966175c..62e90e31c3b 100644
--- a/engines/hpl1/engine/ai/AINodeGenerator.cpp
+++ b/engines/hpl1/engine/ai/AINodeGenerator.cpp
@@ -88,7 +88,8 @@ bool cCollideRayCallback::OnIntersect(iPhysicsBody *pBody, cPhysicsRayParams *ap
 unsigned generatorInstances = 0;
 
 cAINodeGenerator::cAINodeGenerator() {
-	assert(++generatorInstances == 1);
+	++generatorInstances;
+	assert(generatorInstances == 1);
 }
 
 cAINodeGenerator::~cAINodeGenerator() {


Commit: 37ff2f2a3f72405341a94a57ee738db757d4c6b8
    https://github.com/scummvm/scummvm/commit/37ff2f2a3f72405341a94a57ee738db757d4c6b8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-23T18:43:27+02:00

Commit Message:
ICB: Fix infinite loop. CID 1433458

Changed paths:
    engines/icb/gfx/psx_pcgpu.cpp


diff --git a/engines/icb/gfx/psx_pcgpu.cpp b/engines/icb/gfx/psx_pcgpu.cpp
index 7d6c0b9a0a4..d7c991b04fe 100644
--- a/engines/icb/gfx/psx_pcgpu.cpp
+++ b/engines/icb/gfx/psx_pcgpu.cpp
@@ -125,6 +125,8 @@ OT_tag *ClearOTag(OT_tag *ot, uint32 size) {
 	while (i < (size - 1)) {
 		ot[i].addr = (void *)&ot[i + 1];
 		ot[i].len = UNLINKED_LEN;
+
+		i++;
 	}
 	ot[size - 1].addr = UNLINKED_ADDR;
 	ot[size - 1].len = UNLINKED_LEN;