[Scummvm-cvs-logs] scummvm master -> b3b904ddabcda8c39c5b40eec1e2c6c0e14e4ef3
eriktorbjorn
eriktorbjorn at telia.com
Mon Dec 26 22:15:30 CET 2011
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:
b3b904ddab KYRA: Avoid deleting pointer twice after creating EOB2 party
Commit: b3b904ddabcda8c39c5b40eec1e2c6c0e14e4ef3
https://github.com/scummvm/scummvm/commit/b3b904ddabcda8c39c5b40eec1e2c6c0e14e4ef3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2011-12-26T13:13:26-08:00
Commit Message:
KYRA: Avoid deleting pointer twice after creating EOB2 party
It probably happened in EOB as well, but I only actually observed
it in EOB2.
Changed paths:
engines/kyra/chargen.cpp
diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 16911a3..e0f1ac3 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1318,8 +1318,10 @@ void CharacterGenerator::finish() {
_chargenMagicShapes = 0;
}
- for (int i = 0; i < 17; i++)
+ for (int i = 0; i < 17; i++) {
delete[] _chargenButtonLabels[i];
+ _chargenButtonLabels[i] = 0;
+ }
}
const EoBChargenButtonDef CharacterGenerator::_chargenButtonDefs[] = {
More information about the Scummvm-git-logs
mailing list