Просмотр исходного кода

Merge pull request #4154 from ogniK5377/swkbd-nullptr

Prevent nullptr dereference on swkbd error case
bunnei 6 лет назад
Родитель
Сommit
705cccb1e4
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      src/core/hle/service/am/applets/software_keyboard.cpp

+ 1 - 1
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)