Skip to content

Commit 1c2644d

Browse files
committed
fix(memory): possibly dereferencing null pointer
Closes #441
1 parent bcf811c commit 1c2644d

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/rime/gear/memory.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ Memory::Memory(const Ticket& ticket) {
6868

6969
// user dictionary is named after language; dictionary name may have an
7070
// optional suffix separated from the language component by dot.
71-
language_.reset(new Language{
72-
user_dict_ ? user_dict_->name() :
73-
Language::get_language_component(dict_->name())
74-
});
71+
language_.reset(
72+
user_dict_ ? new Language{user_dict_->name()} :
73+
dict_ ? new Language{Language::get_language_component(dict_->name())} :
74+
nullptr);
7575

7676
Context* ctx = ticket.engine->context();
7777
commit_connection_ = ctx->commit_notifier().connect(

0 commit comments

Comments
 (0)