[Scummvm-cvs-logs] scummvm master -> b1893bc5f7929aa363a46f17bf2312fe053cb6ae
sev-
sev at scummvm.org
Mon Apr 29 22:20:48 CEST 2013
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:
b1893bc5f7 SCUMM HE: fix crash introduced in a10ad272a84
Commit: b1893bc5f7929aa363a46f17bf2312fe053cb6ae
https://github.com/scummvm/scummvm/commit/b1893bc5f7929aa363a46f17bf2312fe053cb6ae
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-29T13:16:55-07:00
Commit Message:
SCUMM HE: fix crash introduced in a10ad272a84
Changed paths:
engines/scumm/he/wiz_he.cpp
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index e364105..ca36080 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1548,7 +1548,8 @@ uint8 *Wiz::drawWizImage(int resNum, int state, int maskNum, int maskState, int
if (rScreen.intersects(clip)) {
rScreen.clip(clip);
} else {
- free(dst);
+ if (flags & kWIFBlitToMemBuffer)
+ free(dst);
return 0;
}
@@ -1556,7 +1557,8 @@ uint8 *Wiz::drawWizImage(int resNum, int state, int maskNum, int maskState, int
if (rScreen.intersects(_rectOverride)) {
rScreen.clip(_rectOverride);
} else {
- free(dst);
+ if (flags & kWIFBlitToMemBuffer)
+ free(dst);
return 0;
}
More information about the Scummvm-git-logs
mailing list