80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #4516 from jriwanek-forks/128kfix

Browse Source 
Fix 2 segfaults in DeviceConfig
This commit is contained in:
Miran Grča
2024-06-08 05:07:42 +02:00
committed by GitHub
parent 152c0cbf1d 1d325d411d
commit 56fa1d4964
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/qt_deviceconfig.cpp
View File

@@ -120,6 +120,9 @@ DeviceConfig::ProcessConfig(void *dc, const void *c, const bool is_dep)
int p; int p;
int q; int q;
if (config == NULL)
return;
while (config->type != -1) { while (config->type != -1) {
const int config_type = config->type & CONFIG_TYPE_MASK; const int config_type = config->type & CONFIG_TYPE_MASK;
@@ -363,7 +366,11 @@ DeviceConfig::ConfigureDevice(const _device_ *device, int instance, Settings *se
dc.ProcessConfig(&device_context, config, false); dc.ProcessConfig(&device_context, config, false);
dc.setFixedSize(dc.minimumSizeHint()); dc.setFixedSize(dc.minimumSizeHint());
if (dc.exec() == QDialog::Accepted) { if (dc.exec() == QDialog::Accepted) {
if (config == NULL)
return;
config = device->config; config = device->config;
while (config->type != -1) { while (config->type != -1) {
switch (config->type) { switch (config->type) {