[Scummvm-cvs-logs] scummvm master -> 58fcb43c192eb424897a89dd18ea4788e83deb3f
Strangerke
Strangerke at scummvm.org
Sun May 25 17:40:40 CEST 2014
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:
58fcb43c19 CINE: Add a safeguard to avoid incrementing a null pointer
Commit: 58fcb43c192eb424897a89dd18ea4788e83deb3f
https://github.com/scummvm/scummvm/commit/58fcb43c192eb424897a89dd18ea4788e83deb3f
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-25T17:38:28+02:00
Commit Message:
CINE: Add a safeguard to avoid incrementing a null pointer
Changed paths:
engines/cine/gfx.cpp
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index f6419ec..b9175ca 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -1902,7 +1902,9 @@ void maskBgOverlay(const byte *bgPtr, const byte *maskPtr, int16 width, int16 he
destPtr++;
srcPtr++;
- maskPtr++;
+
+ if (maskPtr)
+ maskPtr++;
}
}
More information about the Scummvm-git-logs
mailing list