nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix memory errors in qt_tilewidth and qt_tileheight

Browse Source 
* qt_tilewidth and qt_tileheight are allocated with alloc() and need
  to be freed with free().
* Don't use them after they're freed. Instead, retrieve the size from
  the glyphs object.
This commit is contained in:
Ray Chason
2023-06-04 22:17:00 -04:00
parent ee27ec97d1
commit 20fb008012
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
win/Qt/qt_set.cpp
View File

@@ -118,11 +118,13 @@ NetHackQtSettings::NetHackQtSettings() :
// Tile/font sizes read from .nethackrc
if (qt_tilewidth != NULL) {
tilewidth.setValue(atoi(qt_tilewidth));
delete[] qt_tilewidth;
free(qt_tilewidth);
qt_tilewidth = NULL;
}
if (qt_tileheight != NULL) {
tileheight.setValue(atoi(qt_tileheight));
delete[] qt_tileheight;
free(qt_tileheight);
qt_tileheight = NULL;
}
if (qt_fontsize != NULL) {
switch (tolower(qt_fontsize[0])) {
@@ -132,7 +134,8 @@ NetHackQtSettings::NetHackQtSettings() :
case 's': default_fontsize = 3; break;
case 't': default_fontsize = 4; break;
}
delete[] qt_fontsize;
free(qt_fontsize);
qt_fontsize = NULL;
}
theglyphs=new NetHackQtGlyphs();