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

Fix a resource leak

Browse source 
This bug was detected via Coverity static analysis:
Variable tempfile going out of scope leaks the storage it points to.

The leak happens when invalid keyboard layout file is being loaded:

  $ touch xx.kl
  $ dosbox .
  C:\>keyb xx
This commit is contained in:
Patryk Obara 2019-11-28 14:46:30 +01:00 • committed by Patryk Obara
parent bd6a50e79e
commit 19b8902db3
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dos/dos_keyboard_layout.cpp
View file

@ -317,6 +317,7 @@ Bitu keyboard_layout::read_keyboard_file(const char* keyboard_file_name, Bit32s
Bit32u dr=(Bit32u)fread(read_buf, sizeof(Bit8u), 4, tempfile);
if ((dr<4) || (read_buf[0]!=0x4b) || (read_buf[1]!=0x4c) || (read_buf[2]!=0x46)) {
LOG(LOG_BIOS,LOG_ERROR)("Invalid keyboard layout file %s",keyboard_file_name);
fclose(tempfile);
return KEYB_INVALIDFILE;
}
@ -670,6 +671,7 @@ Bit16u keyboard_layout::extract_codepage(const char* keyboard_file_name) {
Bit32u dr=(Bit32u)fread(read_buf, sizeof(Bit8u), 4, tempfile);
if ((dr<4) || (read_buf[0]!=0x4b) || (read_buf[1]!=0x4c) || (read_buf[2]!=0x46)) {
LOG(LOG_BIOS,LOG_ERROR)("Invalid keyboard layout file %s",keyboard_file_name);
fclose(tempfile);
return 437;
}