diff options
| author |  David Marcec | 2020-06-25 00:25:15 +1000 |
|---|---|---|
| committer | David Marcec | 2020-06-25 00:25:15 +1000 |
| commit | 510838759f2315f21b0dcb8b27f840b489e1f63c (patch) | |
| tree | 0ab371585bccd76debd0b6c6b0db1059f3cccbaa | |
| parent | Merge pull request #4046 from ogniK5377/macro-hle-prod (diff) | |
| download | yuzu-510838759f2315f21b0dcb8b27f840b489e1f63c.tar.gz yuzu-510838759f2315f21b0dcb8b27f840b489e1f63c.tar.xz yuzu-510838759f2315f21b0dcb8b27f840b489e1f63c.zip | |
Prevent nullptr dereference on swkbd error case
| -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() { | |||
| 60 | std::memcpy(&config, keyboard_config.data(), sizeof(KeyboardConfig)); | 60 | std::memcpy(&config, keyboard_config.data(), sizeof(KeyboardConfig)); |
| 61 | 61 | ||
| 62 | const auto work_buffer_storage = broker.PopNormalDataToApplet(); | 62 | const auto work_buffer_storage = broker.PopNormalDataToApplet(); |
| 63 | ASSERT(work_buffer_storage != nullptr); | 63 | ASSERT_OR_EXECUTE(work_buffer_storage != nullptr, { return; }); |
| 64 | const auto& work_buffer = work_buffer_storage->GetData(); | 64 | const auto& work_buffer = work_buffer_storage->GetData(); |
| 65 | 65 | ||
| 66 | if (config.initial_string_size == 0) | 66 | if (config.initial_string_size == 0) |