Merge pull request #4154 from ogniK5377/swkbd-nullptr

Prevent nullptr dereference on swkbd error case
This commit is contained in:
bunnei 2020-06-26 23:25:04 -04:00 committed by GitHub
commit 705cccb1e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -60,7 +60,7 @@ void SoftwareKeyboard::Initialize() {
std::memcpy(&config, keyboard_config.data(), sizeof(KeyboardConfig)); std::memcpy(&config, keyboard_config.data(), sizeof(KeyboardConfig));
const auto work_buffer_storage = broker.PopNormalDataToApplet(); 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(); const auto& work_buffer = work_buffer_storage->GetData();
if (config.initial_string_size == 0) if (config.initial_string_size == 0)