From 8d895eaa6af6a00e30d5427465ce509c6be69ed8 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 17 Oct 2015 02:51:59 -0700 Subject: [PATCH] UI: Prevent calling of obs functions with NULL params --- obs/window-basic-settings.cpp | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp index 4145efd83..de64390fd 100644 --- a/obs/window-basic-settings.cpp +++ b/obs/window-basic-settings.cpp @@ -398,6 +398,9 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) auto source = static_cast(calldata_ptr(param, "source")); + if (!source) + return; + if (!(obs_source_get_output_flags(source) & OBS_SOURCE_AUDIO)) return; @@ -1354,9 +1357,14 @@ void OBSBasicSettings::LoadListValues(QComboBox *widget, obs_property_t *prop, size_t count = obs_property_list_item_count(prop); obs_source_t *source = obs_get_output_source(index); - obs_data_t *settings = obs_source_get_settings(source); + const char *deviceId = nullptr; + obs_data_t *settings = nullptr; - const char *deviceId = obs_data_get_string(settings, "device_id"); + if (source) { + settings = obs_source_get_settings(source); + if (settings) + deviceId = obs_data_get_string(settings, "device_id"); + } widget->addItem(QTStr("Disabled"), "disabled"); @@ -1366,12 +1374,16 @@ void OBSBasicSettings::LoadListValues(QComboBox *widget, obs_property_t *prop, LoadListValue(widget, name, val); } - int idx = widget->findData(QVariant(QT_UTF8(deviceId))); - if (idx != -1) - widget->setCurrentIndex(idx); + if (deviceId) { + int idx = widget->findData(QVariant(QT_UTF8(deviceId))); + if (idx != -1) + widget->setCurrentIndex(idx); + } - obs_source_release(source); - obs_data_release(settings); + if (settings) + obs_data_release(settings); + if (source) + obs_source_release(source); } void OBSBasicSettings::LoadAudioDevices()