valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix usage of uninitialized value in dos_mscdex

Browse source 
These issues were detected by Clang static analyzer.

Calling GetCurrentPos might leave pos uninitialized, and it will result
in passing uninitialized value pos.min to msf_to_frames function.

Same situation might happen for GetAudioStatus and all variables it
misses to initialize.
This commit is contained in:
Patryk Obara 2019-12-07 18:56:06 +01:00 • committed by Patryk Obara
parent 496611b2ce
commit 6dde4e78bf
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/dos/dos_mscdex.cpp
View file

@ -900,7 +900,7 @@ static Bit16u MSCDEX_IOCTL_Input(PhysPt buffer,Bit8u drive_unit) {
mem_writed(buffer+1,RealMake(mscdex->rootDriverHeaderSeg,0));
break;
case 0x01 :{/* Get current position */
TMSF pos;
TMSF pos = {0, 0, 0};
mscdex->GetCurrentPos(drive_unit,pos);
Bit8u addr_mode = mem_readb(buffer+1);
if (addr_mode==0) { // HSG
@ -989,8 +989,10 @@ static Bit16u MSCDEX_IOCTL_Input(PhysPt buffer,Bit8u drive_unit) {
break;
};
case 0x0F :{ /* Get Audio Status */
bool playing,pause;
TMSF resStart,resEnd;
bool playing = false;
bool pause = false;
TMSF resStart = {0, 0, 0};
TMSF resEnd = {0, 0, 0};
mscdex->GetAudioStatus(drive_unit,playing,pause,resStart,resEnd);
mem_writeb(buffer+1,pause);
mem_writeb(buffer+3,resStart.min);