diff options
| author | bunnei <bunneidev@gmail.com> | 2020-06-26 23:25:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 23:25:04 -0400 |
| commit | 705cccb1e44afaed96723052cdad9c24ab12529a (patch) | |
| tree | b1e14ab20fc69ba33c5e092afca3cb57136661e4 /src | |
| parent | efef7b151734207b4cc9487147d9bed4328c13cc (diff) | |
| parent | 510838759f2315f21b0dcb8b27f840b489e1f63c (diff) | |
Merge pull request #4154 from ogniK5377/swkbd-nullptr
Prevent nullptr dereference on swkbd error case
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/am/applets/software_keyboard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp index d14076b02..fbe3686ae 100644 --- a/src/core/hle/service/am/applets/software_keyboard.cpp +++ b/src/core/hle/service/am/applets/software_keyboard.cpp @@ -60,7 +60,7 @@ void SoftwareKeyboard::Initialize() { std::memcpy(&config, keyboard_config.data(), sizeof(KeyboardConfig)); const auto work_buffer_storage = broker.PopNormalDataToApplet(); - ASSERT(work_buffer_storage != nullptr); + ASSERT_OR_EXECUTE(work_buffer_storage != nullptr, { return; }); const auto& work_buffer = work_buffer_storage->GetData(); if (config.initial_string_size == 0) |