jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-04-13 20:00:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Guard against garbage resolution index in the registry

Browse Source 
When using a registry file created by commit real-1.5.0-590-g72cca136
with an executable built from commit real-1.5.0-533-gc99e57cf, there
is a startup crash due to unsanitized values read from the registry.
(There are much more resolutions available in 590 than 533.)

==19328==ERROR: AddressSanitizer: global-buffer-overflow on address
0x0000027dee44 [line numbers as per c99e57cf]
READ of size 2 at 0x0000027dee44 thread T0
    f0 opengl_Setup(oeApplication*, int const*, int const*) renderer/HardwareOpenGL.cpp:356
    f1 opengl_Init(oeApplication*, renderer_preferred_state*) renderer/HardwareOpenGL.cpp:590
    f2 rend_Init(renderer_type, oeApplication*, renderer_preferred_state*) renderer/HardwareOpenGL.cpp:1299
    f3 SetScreenMode(int, bool) Descent3/game.cpp:962
    f4 Descent3() Descent3/descent.cpp:478
    f5 oeD3LnxApp::run() Descent3/sdlmain.cpp:142
    f6 main Descent3/sdlmain.cpp:322

0x0000027dee44 is located 32 bytes after global variable 'Default_detail_level' defined in 'Descent3/config.cpp:316:5' (0x0000027dee20) of size 4
0x0000027dee44 is located 28 bytes before global variable 'Game_toggles' defined in 'Descent3/config.cpp:318:14' (0x0000027dee60) of size 3
SUMMARY: AddressSanitizer: global-buffer-overflow renderer/HardwareOpenGL.cpp:356 in opengl_Setup(oeApplication*, int const*, int const*)
This commit is contained in:
Jan Engelhardt
2025-05-23 15:46:34 +02:00
parent c5245d62ae
commit 7f25752440
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Descent3/init.cpp
View File

@@ -1304,7 +1304,11 @@ void LoadGameSettings() {
Database->read_int("RoomLeveling", &Default_player_room_leveling);
Database->read("Specmapping", &Detail_settings.Specular_lighting);
Database->read("RS_bitdepth", &Render_preferred_bitdepth, sizeof(Render_preferred_bitdepth));
Database->read_int("RS_resolution", &Current_video_resolution_id);
Database->read_int("RS_resolution", &tempint);
if (tempint >= 0 && tempint < std::size(Video_res_list))
Current_video_resolution_id = tempint;
else
LOG_WARNING << "Game settings contain a display resolution index that is out of bounds. Starting with default resolution.";
int tempval = 0;
Database->read_int("RS_fov", &tempval);