[Scummvm-cvs-logs] scummvm master -> a7055e75d12c041c9b6e94887b753f652d3e604c
sev-
sev at scummvm.org
Mon Oct 7 23:12:13 CEST 2013
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1fd58f7f2e AGI: Fix bad buffer overrun. CID 1004029
ae6f205b93 SWORD25: Fix potential buffer overrun. CID 1003865
753c9198e9 LASTEXPRESS: Fix potential buffer overruns. Numerous CID 1003873-1003885
d71b48b120 LASTEXPRESS: Comment out unused variable
669cb76de4 KYRA: Fixed missing curly brackets. CID 1003639
067ce95965 SAGA: Remove unused assignment. CID 1002505
9faa5d66b7 SAGA: Remove unused assignment. CID 1002506
a7055e75d1 PARALLACTION: Comment out unused assignment. CID 1002508
Commit: 1fd58f7f2e60fa972c77bbf825631214dd4ef40e
https://github.com/scummvm/scummvm/commit/1fd58f7f2e60fa972c77bbf825631214dd4ef40e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-07T14:11:18-07:00
Commit Message:
AGI: Fix bad buffer overrun. CID 1004029
Changed paths:
engines/agi/preagi_mickey.cpp
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index ed4882f..d0f6540 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -850,7 +850,7 @@ void MickeyEngine::drawRoomAnimation() {
}
void MickeyEngine::drawRoom() {
- uint8 buffer[256];
+ uint8 buffer[512];
int pBuf = 0;
int nObjs;
Commit: ae6f205b93a2ffc8e07c1d7f25e6e9d942c5a965
https://github.com/scummvm/scummvm/commit/ae6f205b93a2ffc8e07c1d7f25e6e9d942c5a965
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-07T14:11:18-07:00
Commit Message:
SWORD25: Fix potential buffer overrun. CID 1003865
Changed paths:
engines/sword25/kernel/persistenceservice.cpp
diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp
index 27d669c..df26da7 100644
--- a/engines/sword25/kernel/persistenceservice.cpp
+++ b/engines/sword25/kernel/persistenceservice.cpp
@@ -59,7 +59,7 @@ static const int VERSIONNUM = 2;
char gameTarget[MAX_SAVEGAME_SIZE];
void setGameTarget(const char *target) {
- strncpy(gameTarget, target, MAX_SAVEGAME_SIZE);
+ strncpy(gameTarget, target, MAX_SAVEGAME_SIZE - 1);
}
static Common::String generateSavegameFilename(uint slotID) {
Commit: 753c9198e947a03cfb02676ad8c021f8d6cbee64
https://github.com/scummvm/scummvm/commit/753c9198e947a03cfb02676ad8c021f8d6cbee64
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-07T14:11:18-07:00
Commit Message:
LASTEXPRESS: Fix potential buffer overruns. Numerous CID 1003873-1003885
Changed paths:
engines/lastexpress/entities/entity.h
diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index c67d13d..5aa7c1b 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -330,7 +330,7 @@ public:
};
struct EntityParametersSIII : EntityParameters {
- char seq[12];
+ char seq[13];
uint param4;
uint param5;
uint param6;
@@ -338,7 +338,7 @@ public:
uint param8;
EntityParametersSIII() {
- memset(&seq, 0, 12);
+ memset(&seq, 0, 13);
param4 = 0;
param5 = 0;
param6 = 0;
@@ -374,16 +374,16 @@ public:
};
struct EntityParametersSIIS : EntityParameters {
- char seq1[12];
+ char seq1[13];
uint param4;
uint param5;
- char seq2[12];
+ char seq2[13];
EntityParametersSIIS() {
- memset(&seq1, 0, 12);
+ memset(&seq1, 0, 13);
param4 = 0;
param5 = 0;
- memset(&seq2, 0, 12);
+ memset(&seq2, 0, 13);
}
Common::String toString() {
@@ -410,14 +410,14 @@ public:
struct EntityParametersISSI : EntityParameters {
uint param1;
- char seq1[12];
- char seq2[12];
+ char seq1[13];
+ char seq2[13];
uint param8;
EntityParametersISSI() {
param1 = 0;
- memset(&seq1, 0, 12);
- memset(&seq2, 0, 12);
+ memset(&seq1, 0, 13);
+ memset(&seq2, 0, 13);
param8 = 0;
}
@@ -445,7 +445,7 @@ public:
struct EntityParametersISII : EntityParameters {
uint param1;
- char seq[12];
+ char seq[13];
uint param5;
uint param6;
uint param7;
@@ -453,7 +453,7 @@ public:
EntityParametersISII() {
param1 = 0;
- memset(&seq, 0, 12);
+ memset(&seq, 0, 13);
param5 = 0;
param6 = 0;
param7 = 0;
@@ -488,14 +488,14 @@ public:
};
struct EntityParametersSSII : EntityParameters {
- char seq1[12];
- char seq2[12];
+ char seq1[13];
+ char seq2[13];
uint param7;
uint param8;
EntityParametersSSII() {
- memset(&seq1, 0, 12);
- memset(&seq2, 0, 12);
+ memset(&seq1, 0, 13);
+ memset(&seq2, 0, 13);
param7 = 0;
param8 = 0;
}
@@ -523,14 +523,14 @@ public:
};
struct EntityParametersSSS : EntityParameters {
- char seq1[12];
- char seq2[12];
- char seq3[8];
+ char seq1[13];
+ char seq2[13];
+ char seq3[9];
EntityParametersSSS() {
- memset(&seq1, 0, 12);
- memset(&seq2, 0, 12);
- memset(&seq3, 0, 8);
+ memset(&seq1, 0, 13);
+ memset(&seq2, 0, 13);
+ memset(&seq3, 0, 9);
}
Common::String toString() {
@@ -551,14 +551,14 @@ public:
struct EntityParametersIISS : EntityParameters {
uint param1;
uint param2;
- char seq1[12];
- char seq2[12];
+ char seq1[13];
+ char seq2[13];
EntityParametersIISS() {
param1 = 0;
param2 = 0;
- memset(&seq1, 0, 12);
- memset(&seq2, 0, 12);
+ memset(&seq1, 0, 13);
+ memset(&seq2, 0, 13);
}
Common::String toString() {
@@ -586,7 +586,7 @@ public:
struct EntityParametersIISI : EntityParameters {
uint param1;
uint param2;
- char seq[12];
+ char seq[13];
uint param6;
uint param7;
uint param8;
@@ -594,7 +594,7 @@ public:
EntityParametersIISI() {
param1 = 0;
param2 = 0;
- memset(&seq, 0, 12);
+ memset(&seq, 0, 13);
param6 = 0;
param7 = 0;
param8 = 0;
@@ -631,7 +631,7 @@ public:
uint param1;
uint param2;
uint param3;
- char seq[12];
+ char seq[13];
uint param7;
uint param8;
@@ -639,7 +639,7 @@ public:
param1 = 0;
param2 = 0;
param3 = 0;
- memset(&seq, 0, 12);
+ memset(&seq, 0, 13);
param7 = 0;
param8 = 0;
}
@@ -677,7 +677,7 @@ public:
uint param3;
uint param4;
uint param5;
- char seq[12];
+ char seq[13];
EntityParametersI5S() {
param1 = 0;
@@ -685,7 +685,7 @@ public:
param3 = 0;
param4 = 0;
param5 = 0;
- memset(&seq, 0, 12);
+ memset(&seq, 0, 13);
}
void saveLoadWithSerializer(Common::Serializer &s) {
Commit: d71b48b120870d588ce3331a74ce6bb138eacc59
https://github.com/scummvm/scummvm/commit/d71b48b120870d588ce3331a74ce6bb138eacc59
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-07T14:11:18-07:00
Commit Message:
LASTEXPRESS: Comment out unused variable
Changed paths:
engines/lastexpress/game/inventory.cpp
engines/lastexpress/game/inventory.h
diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp
index 11e7369..8edef90 100644
--- a/engines/lastexpress/game/inventory.cpp
+++ b/engines/lastexpress/game/inventory.cpp
@@ -44,7 +44,7 @@
namespace LastExpress {
Inventory::Inventory(LastExpressEngine *engine) : _engine(engine), _selectedItem(kItemNone), _highlightedItemIndex(0), _itemsShown(0),
- _showingHourGlass(false), _blinkingDirection(1), _blinkingBrightness(0),
+ /*_showingHourGlass(false), */ _blinkingDirection(1), _blinkingBrightness(0),
_useMagnifier(false), _portraitHighlighted(false), _isOpened(false), _eggHightlighted(false), _itemScene(NULL) {
//_inventoryRect = Common::Rect(0, 0, 32, 32);
diff --git a/engines/lastexpress/game/inventory.h b/engines/lastexpress/game/inventory.h
index b1019a4..9b82ef0 100644
--- a/engines/lastexpress/game/inventory.h
+++ b/engines/lastexpress/game/inventory.h
@@ -140,7 +140,7 @@ private:
uint32 _itemsShown;
- bool _showingHourGlass;
+ //bool _showingHourGlass;
int16 _blinkingDirection;
uint16 _blinkingBrightness;
Commit: 669cb76de4bb63511d46c3c50e1f486f1dbcc401
https://github.com/scummvm/scummvm/commit/669cb76de4bb63511d46c3c50e1f486f1dbcc401
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-07T14:11:18-07:00
Commit Message:
KYRA: Fixed missing curly brackets. CID 1003639
Although I did not consult with disassembly, judging from the game
logic _unkEndSeqVar4 is used for switching certain Malcolm frames,
and it is apparent that this should happen only under condition,
not always.
Changed paths:
engines/kyra/sequences_lok.cpp
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index 2a2f9a5..51f1ea5 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -1722,9 +1722,10 @@ int KyraEngine_LoK::handleBeadState() {
_screen->addBitBlitRect(_beadState1.x, _beadState1.y, _beadState1.width2, _beadState1.height);
++_beadState1.tableIndex;
- if (_beadState1.tableIndex > 24)
+ if (_beadState1.tableIndex > 24) {
_beadState1.tableIndex = 0;
_unkEndSeqVar4 = 1;
+ }
if (_system->getMillis() > _beadStateTimer2 && _malcolmFlag == 7 && !_unkAmuletVar && !_text->printed()) {
snd_playSoundEffect(0x0B);
if (_currentCharacter->x1 > 233 && _currentCharacter->x1 < 305 && _currentCharacter->y1 > 85 && _currentCharacter->y1 < 105 &&
Commit: 067ce959653b6a79869c620c6e83a6659970ecc5
https://github.com/scummvm/scummvm/commit/067ce959653b6a79869c620c6e83a6659970ecc5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-07T14:11:18-07:00
Commit Message:
SAGA: Remove unused assignment. CID 1002505
Changed paths:
engines/saga/introproc_ite.cpp
diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index 484ebe1..25fe334 100644
--- a/engines/saga/introproc_ite.cpp
+++ b/engines/saga/introproc_ite.cpp
@@ -993,7 +993,7 @@ int Scene::ITEIntroTreeHouseProc(int param) {
}
// Queue game credits list
- eventColumns = ITEQueueCredits(DISSOLVE_DURATION + 2000, CREDIT_DURATION1, n_credits1, credits1);
+ ITEQueueCredits(DISSOLVE_DURATION + 2000, CREDIT_DURATION1, n_credits1, credits1);
eventColumns = ITEQueueCredits(DISSOLVE_DURATION + 7000, CREDIT_DURATION1, n_credits2, credits2);
// End scene after credit display
Commit: 9faa5d66b706f3b5cebd11d146dbb945dfc334e0
https://github.com/scummvm/scummvm/commit/9faa5d66b706f3b5cebd11d146dbb945dfc334e0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-07T14:11:18-07:00
Commit Message:
SAGA: Remove unused assignment. CID 1002506
Changed paths:
engines/saga/introproc_ite.cpp
diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index 25fe334..ed53e07 100644
--- a/engines/saga/introproc_ite.cpp
+++ b/engines/saga/introproc_ite.cpp
@@ -1073,7 +1073,7 @@ int Scene::ITEIntroFairePathProc(int param) {
_vm->_events->chain(eventColumns, event);
// Queue game credits list
- eventColumns = ITEQueueCredits(DISSOLVE_DURATION + 2000, CREDIT_DURATION1, n_credits1, credits1);
+ ITEQueueCredits(DISSOLVE_DURATION + 2000, CREDIT_DURATION1, n_credits1, credits1);
eventColumns = ITEQueueCredits(DISSOLVE_DURATION + 7000, CREDIT_DURATION1, n_credits2, credits2);
// End scene after credit display
Commit: a7055e75d12c041c9b6e94887b753f652d3e604c
https://github.com/scummvm/scummvm/commit/a7055e75d12c041c9b6e94887b753f652d3e604c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-07T14:11:18-07:00
Commit Message:
PARALLACTION: Comment out unused assignment. CID 1002508
Changed paths:
engines/parallaction/debug.cpp
diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp
index 25acac9..4a8f8c7 100644
--- a/engines/parallaction/debug.cpp
+++ b/engines/parallaction/debug.cpp
@@ -62,8 +62,8 @@ void Debugger::postEnter() {
bool Debugger::Cmd_Location(int argc, const char **argv) {
- const char *character = _vm->_char.getName();
- const char *location = _vm->_location._name;
+ const char *character; // = _vm->_char.getName();
+ const char *location; // = _vm->_location._name;
char tmp[PATH_LEN];
More information about the Scummvm-git-logs
mailing list