[Scummvm-git-logs] scummvm master -> 359c027b01f8d7fa006499778d872aba460a0716

[sev-]

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

Summary:
8b01125399 AUDIO: Fix incorrect null check. CID 1519099
359c027b01 AUDIO: Initialize class variables. CID 1519100


Commit: 8b01125399e025389ad0bef6d80c248b958e8e09
    https://github.com/scummvm/scummvm/commit/8b01125399e025389ad0bef6d80c248b958e8e09
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T19:48:56+02:00

Commit Message:
AUDIO: Fix incorrect null check. CID 1519099

Changed paths:
    audio/mods/impulsetracker.cpp


diff --git a/audio/mods/impulsetracker.cpp b/audio/mods/impulsetracker.cpp
index a49e43451a2..918baa8889e 100644
--- a/audio/mods/impulsetracker.cpp
+++ b/audio/mods/impulsetracker.cpp
@@ -92,7 +92,7 @@ static BOOL memoryReaderRead(MREADER *reader, void *ptr, size_t size) {
 	MikMemoryReader *mr;
 	mr = (MikMemoryReader *)reader;
 
-	if (!mr && !mr->stream)
+	if (!mr || !mr->stream)
 		return 0;
 
 	uint32 receivedBytes = mr->stream->read(ptr, size);


Commit: 359c027b01f8d7fa006499778d872aba460a0716
    https://github.com/scummvm/scummvm/commit/359c027b01f8d7fa006499778d872aba460a0716
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T19:48:56+02:00

Commit Message:
AUDIO: Initialize class variables. CID 1519100

Changed paths:
    audio/mods/impulsetracker.cpp


diff --git a/audio/mods/impulsetracker.cpp b/audio/mods/impulsetracker.cpp
index 918baa8889e..bc8df733a50 100644
--- a/audio/mods/impulsetracker.cpp
+++ b/audio/mods/impulsetracker.cpp
@@ -173,8 +173,8 @@ private:
 	DisposeAfterUse::Flag _dispose;
 	bool _mikmod_load_successful = false;
 	Common::SeekableReadStream *_stream;
-	MREADER *_reader;
-	MODULE *_mod;
+	MREADER *_reader = nullptr;
+	MODULE *_mod = nullptr;
 };
 
 ImpulseTrackerMod::ImpulseTrackerMod(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse) {