Emulation/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2024-05-15 02:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

VIDEO: PACo decoder: Add bounds and null checks

Browse source 
Fixes playback of various videos in Hell Cab.
This commit is contained in:
Scott Percival 2024-04-12 01:26:48 +08:00 committed by Eugene Sandulenko
parent bf3947c19a
commit 1d44f6892b
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
video/paco_decoder.cpp
View file

@ -115,11 +115,11 @@ int PacoDecoder::getAudioSamplingRate() {
* Search for the first audio packet and use it.
*/
const Common::Array<int> samplingRates = {5563, 7418, 11127, 22254};
int index;
int index = 0;
int64 startPos = _fileStream->pos();
while (true){
while (_fileStream->pos() < _fileStream->size()) {
int64 currentPos = _fileStream->pos();
int frameType = _fileStream->readByte();
int v = _fileStream->readByte();
@ -226,16 +226,20 @@ void PacoDecoder::readNextPacket() {
switch (frameType) {
case AUDIO:
_audioTrack->queueSound(_fileStream, chunkSize - 4);
if (_audioTrack)
_audioTrack->queueSound(_fileStream, chunkSize - 4);
break;
case VIDEO:
_videoTrack->handleFrame(_fileStream, chunkSize - 4, _curFrame);
if (_videoTrack)
_videoTrack->handleFrame(_fileStream, chunkSize - 4, _curFrame);
break;
case PALLETE:
_videoTrack->handlePalette(_fileStream);
if (_videoTrack)
_videoTrack->handlePalette(_fileStream);
break;
case EOC:
_videoTrack->handleEOC();
if (_videoTrack)
_videoTrack->handleEOC();
break;
case NOP:
break;