ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #641 from ggrtk/nullptr-fix 

CommonHostInterface: Prevent some potential null pointer dereferences
This commit is contained in:
Connor McLaughlin 2020-07-22 13:00:18 +10:00 committed by GitHub
parent c8b6712010 855fc9a31c
commit 60a411ebfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/duckstation-qt/qthostinterface.cpp
View File

@ -484,6 +484,9 @@ void QtHostInterface::connectDisplaySignals(QtDisplayWidget* widget)
void QtHostInterface::updateDisplayState() void QtHostInterface::updateDisplayState()
{ {
if (!m_display)
return;
// this expects the context to get moved back to us afterwards // this expects the context to get moved back to us afterwards
m_display->DoneRenderContextCurrent(); m_display->DoneRenderContextCurrent();

7
src/frontend-common/common_host_interface.cpp
View File

@ -551,13 +551,16 @@ bool CommonHostInterface::ResumeSystemFromMostRecentState()
void CommonHostInterface::UpdateSpeedLimiterState() void CommonHostInterface::UpdateSpeedLimiterState()
{ {
if (!m_system || !m_audio_stream || !m_display)
return;
m_speed_limiter_enabled = m_settings.speed_limiter_enabled && !m_speed_limiter_temp_disabled; m_speed_limiter_enabled = m_settings.speed_limiter_enabled && !m_speed_limiter_temp_disabled;
const bool is_non_standard_speed = (std::abs(m_settings.emulation_speed - 1.0f) > 0.05f); const bool is_non_standard_speed = (std::abs(m_settings.emulation_speed - 1.0f) > 0.05f);
const bool audio_sync_enabled = const bool audio_sync_enabled =
!m_system || m_paused || (m_speed_limiter_enabled && m_settings.audio_sync_enabled && !is_non_standard_speed); m_paused || (m_speed_limiter_enabled && m_settings.audio_sync_enabled && !is_non_standard_speed);
const bool video_sync_enabled = const bool video_sync_enabled =
!m_system || m_paused || (m_speed_limiter_enabled && m_settings.video_sync_enabled && !is_non_standard_speed); m_paused || (m_speed_limiter_enabled && m_settings.video_sync_enabled && !is_non_standard_speed);
Log_InfoPrintf("Syncing to %s%s", audio_sync_enabled ? "audio" : "", Log_InfoPrintf("Syncing to %s%s", audio_sync_enabled ? "audio" : "",
(audio_sync_enabled && video_sync_enabled) ? " and video" : (video_sync_enabled ? "video" : "")); (audio_sync_enabled && video_sync_enabled) ? " and video" : (video_sync_enabled ? "video" : ""));