[Scummvm-cvs-logs] scummvm master -> eddf8cba936b55511428e43b123995e9d1253c13

sev- sev at scummvm.org
Thu May 2 13:20:09 CEST 2013


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7c26b6ee0a AUDIO: Fix unitialized variable. CID 1003162
0a329688d3 AUDIO: Fix unitialized variable. CID 1003161
5cc5104692 AUDIO: Fix uninitalized variable. CID 1003160
eddf8cba93 AGI: Fix unitialized variables. CID 1002922


Commit: 7c26b6ee0a6ed9193dd7762df38c65ffdffe3d7c
    https://github.com/scummvm/scummvm/commit/7c26b6ee0a6ed9193dd7762df38c65ffdffe3d7c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-05-02T04:01:13-07:00

Commit Message:
AUDIO: Fix unitialized variable. CID 1003162

Changed paths:
    audio/midiparser.cpp



diff --git a/audio/midiparser.cpp b/audio/midiparser.cpp
index eec32c0..9c144c2 100644
--- a/audio/midiparser.cpp
+++ b/audio/midiparser.cpp
@@ -46,6 +46,7 @@ _numTracks(0),
 _activeTrack(255),
 _abortParse(0) {
 	memset(_activeNotes, 0, sizeof(_activeNotes));
+	memset(_tracks, 0, sizeof(_tracks));
 	_nextEvent.start = NULL;
 	_nextEvent.delta = 0;
 	_nextEvent.event = 0;


Commit: 0a329688d3505a6963845ae8ec882e75de1efbd6
    https://github.com/scummvm/scummvm/commit/0a329688d3505a6963845ae8ec882e75de1efbd6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-05-02T04:07:44-07:00

Commit Message:
AUDIO: Fix unitialized variable. CID 1003161

Changed paths:
    audio/midiparser_xmidi.cpp



diff --git a/audio/midiparser_xmidi.cpp b/audio/midiparser_xmidi.cpp
index 11690b0..e7b02bf 100644
--- a/audio/midiparser_xmidi.cpp
+++ b/audio/midiparser_xmidi.cpp
@@ -48,7 +48,7 @@ protected:
 	void parseNextEvent(EventInfo &info);
 
 public:
-	MidiParser_XMIDI(XMidiCallbackProc proc, void *data) : _callbackProc(proc), _callbackData(data) {}
+	MidiParser_XMIDI(XMidiCallbackProc proc, void *data) : _callbackProc(proc), _callbackData(data), _loopCount(-1) {}
 	~MidiParser_XMIDI() { }
 
 	bool loadMusic(byte *data, uint32 size);


Commit: 5cc510469298e923b5b3160a8522d47731f0c1fb
    https://github.com/scummvm/scummvm/commit/5cc510469298e923b5b3160a8522d47731f0c1fb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-05-02T04:10:40-07:00

Commit Message:
AUDIO: Fix uninitalized variable. CID 1003160

Changed paths:
    audio/mixer.cpp



diff --git a/audio/mixer.cpp b/audio/mixer.cpp
index 5ea0517..8ff364b 100644
--- a/audio/mixer.cpp
+++ b/audio/mixer.cpp
@@ -491,7 +491,7 @@ Channel::Channel(Mixer *mixer, Mixer::SoundType type, AudioStream *stream,
                  DisposeAfterUse::Flag autofreeStream, bool reverseStereo, int id, bool permanent)
     : _type(type), _mixer(mixer), _id(id), _permanent(permanent), _volume(Mixer::kMaxChannelVolume),
       _balance(0), _pauseLevel(0), _samplesConsumed(0), _samplesDecoded(0), _mixerTimeStamp(0),
-      _pauseStartTime(0), _pauseTime(0), _converter(0),
+      _pauseStartTime(0), _pauseTime(0), _converter(0), _volL(0), _volR(0),
       _stream(stream, autofreeStream) {
 	assert(mixer);
 	assert(stream);


Commit: eddf8cba936b55511428e43b123995e9d1253c13
    https://github.com/scummvm/scummvm/commit/eddf8cba936b55511428e43b123995e9d1253c13
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-05-02T04:17:46-07:00

Commit Message:
AGI: Fix unitialized variables. CID 1002922

Changed paths:
    engines/agi/agi.cpp



diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index f79dfa3..1c34218 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -585,6 +585,21 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
 	setupOpcodes();
 	_game._curLogic = NULL;
 	_timerHack = 0;
+
+	_lastSaveTime = 0;
+	_lastTick = 0;
+
+	memset(_keyQueue, 0, sizeof(_keyQueue));
+	memset(_predictiveResult, 0, sizeof(_predictiveResult));
+
+	_sprites = NULL;
+	_picture = NULL;
+	_loader = NULL;
+	_console = NULL;
+
+	_egoHoldKey = false;
+	
+	
 }
 
 void AgiEngine::initialize() {






More information about the Scummvm-git-logs mailing list