From 1c2644de2b026972dd80a3770b92d7194d523303 Mon Sep 17 00:00:00 2001 From: Chen Gong Date: Tue, 9 Feb 2021 23:40:54 +0800 Subject: [PATCH] fix(memory): possibly dereferencing null pointer Closes #441 --- src/rime/gear/memory.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rime/gear/memory.cc b/src/rime/gear/memory.cc index 2b70c1a66..3bc7671d8 100644 --- a/src/rime/gear/memory.cc +++ b/src/rime/gear/memory.cc @@ -68,10 +68,10 @@ Memory::Memory(const Ticket& ticket) { // user dictionary is named after language; dictionary name may have an // optional suffix separated from the language component by dot. - language_.reset(new Language{ - user_dict_ ? user_dict_->name() : - Language::get_language_component(dict_->name()) - }); + language_.reset( + user_dict_ ? new Language{user_dict_->name()} : + dict_ ? new Language{Language::get_language_component(dict_->name())} : + nullptr); Context* ctx = ticket.engine->context(); commit_connection_ = ctx->commit_notifier().connect(