[Scummvm-git-logs] scummvm master -> c089db9711997da84d745426b51456095359fd23
aquadran
noreply at scummvm.org
Mon Nov 4 09:13:19 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c089db9711 WINTERMUTE: CID: 1564838, 1564804, 1564834, 1564833, 1564811
Commit: c089db9711997da84d745426b51456095359fd23
https://github.com/scummvm/scummvm/commit/c089db9711997da84d745426b51456095359fd23
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2024-11-04T10:13:13+01:00
Commit Message:
WINTERMUTE: CID: 1564838, 1564804, 1564834, 1564833, 1564811
Changed paths:
engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
engines/wintermute/base/gfx/xfile_loader.cpp
engines/wintermute/ext/wme_vlink.h
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
index 4d84e8b39cb..5f63ba0a63f 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
@@ -51,7 +51,7 @@ protected:
GLuint _indexBuffer;
OpenGL::Shader *_shader;
- OpenGL::Shader *_flatShadowShader;
+ OpenGL::Shader *_flatShadowShader{};
};
} // namespace Wintermute
diff --git a/engines/wintermute/base/gfx/xfile_loader.cpp b/engines/wintermute/base/gfx/xfile_loader.cpp
index fb87a73a9dd..3d05e034459 100644
--- a/engines/wintermute/base/gfx/xfile_loader.cpp
+++ b/engines/wintermute/base/gfx/xfile_loader.cpp
@@ -723,8 +723,11 @@ bool XFileLoader::decompressMsZipData() {
if (!readLE32(&decompressedSize)) {
error = true;
} else {
- if (decompressedSize < 16)
+ if (decompressedSize < 16) {
+ delete[] compressedBlock;
+ delete[] decompressedBlock;
return false;
+ }
decompressedSize -= 16;
}
diff --git a/engines/wintermute/ext/wme_vlink.h b/engines/wintermute/ext/wme_vlink.h
index e8f724db3d3..cce477b3d64 100644
--- a/engines/wintermute/ext/wme_vlink.h
+++ b/engines/wintermute/ext/wme_vlink.h
@@ -47,9 +47,9 @@ private:
Video::VideoDecoder *_videoDecoder{};
Graphics::Surface _surface;
int32 _volume;
- bool _videoFinished;
- bool _updateNeeded;
- int32 _frame;
+ bool _videoFinished{};
+ bool _updateNeeded{};
+ int32 _frame{};
static void timerCallback(void *instance);
void prepareFrame();
More information about the Scummvm-git-logs
mailing list