[Scummvm-git-logs] scummvm master -> 12b4b076216127175cf2f85c77ddd772eda48706

[AndywinXp]

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:
12b4b07621 LASTEXPRESS: Fix more Valgrind issues


Commit: 12b4b076216127175cf2f85c77ddd772eda48706
    https://github.com/scummvm/scummvm/commit/12b4b076216127175cf2f85c77ddd772eda48706
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-28T21:21:07+02:00

Commit Message:
LASTEXPRESS: Fix more Valgrind issues

Changed paths:
    engines/lastexpress/game/nis.cpp
    engines/lastexpress/lastexpress.cpp
    engines/lastexpress/menu/clock.cpp


diff --git a/engines/lastexpress/game/nis.cpp b/engines/lastexpress/game/nis.cpp
index 10a52461da6..f6e1adf9c96 100644
--- a/engines/lastexpress/game/nis.cpp
+++ b/engines/lastexpress/game/nis.cpp
@@ -254,6 +254,7 @@ bool NISManager::initNIS(const char *filename, int32 flags) {
 
 	getStream(_eventsByteStream, 8 * _eventsCount);
 
+	SAFE_DELETE_ARR(_events);
 	_events = new NisEvents[_eventsCount];
 
 	for (int i = 0; i < _eventsCount; i++) {
diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp
index 7851342888f..3b583902a14 100644
--- a/engines/lastexpress/lastexpress.cpp
+++ b/engines/lastexpress/lastexpress.cpp
@@ -69,7 +69,6 @@ LastExpressEngine::~LastExpressEngine() {
 	SAFE_DELETE(_otisMan);
 	SAFE_DELETE(_subtitleMan);
 	SAFE_DELETE(_archiveMan);
-	SAFE_DELETE(_memMan);
 	SAFE_DELETE(_msgMan);
 	SAFE_DELETE(_nisMan);
 	SAFE_DELETE(_soundMan);
@@ -80,6 +79,7 @@ LastExpressEngine::~LastExpressEngine() {
 	SAFE_DELETE(_vcr);
 	SAFE_DELETE(_soundMutex);
 	SAFE_DELETE(_savegame);
+	SAFE_DELETE(_memMan);
 
 	//_debugger is deleted by Engine
 
diff --git a/engines/lastexpress/menu/clock.cpp b/engines/lastexpress/menu/clock.cpp
index f56637cbf3c..8dfcc500d97 100644
--- a/engines/lastexpress/menu/clock.cpp
+++ b/engines/lastexpress/menu/clock.cpp
@@ -31,7 +31,41 @@ Clock::Clock(LastExpressEngine *engine) {
 }
 
 Clock::~Clock() {
+	if (_seqMinutes) {
+		_engine->getMemoryManager()->freeMem(_seqMinutes->rawSeqData);
+		delete _seqMinutes;
+		_seqMinutes = nullptr;
+	}
+
+	if (_seqHour) {
+		_engine->getMemoryManager()->freeMem(_seqHour->rawSeqData);
+		delete _seqHour;
+		_seqHour = nullptr;
+	}
+
+	if (_seqSun) {
+		_engine->getMemoryManager()->freeMem(_seqSun->rawSeqData);
+		delete _seqSun;
+		_seqSun = nullptr;
+	}
 
+	if (_seqDate) {
+		_engine->getMemoryManager()->freeMem(_seqDate->rawSeqData);
+		delete _seqDate;
+		_seqDate = nullptr;
+	}
+
+	if (_seqLine1) {
+		_engine->getMemoryManager()->freeMem(_seqLine1->rawSeqData);
+		delete _seqLine1;
+		_seqLine1 = nullptr;
+	}
+
+	if (_seqLine2) {
+		_engine->getMemoryManager()->freeMem(_seqLine2->rawSeqData);
+		delete _seqLine2;
+		_seqLine2 = nullptr;
+	}
 }
 
 void Clock::startClock(int32 time) {