From 0b941652e08d5e404ce795c068064fd13692500c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=9F=8E=E8=8C=B6=E8=AF=AD?= Date: Tue, 22 Apr 2025 17:01:26 +0800 Subject: [PATCH 1/3] fix nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小城茶语 --- frameworks/cj/src/cj_input_method_controller.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frameworks/cj/src/cj_input_method_controller.cpp b/frameworks/cj/src/cj_input_method_controller.cpp index 4566f4d0c..b065db2b1 100644 --- a/frameworks/cj/src/cj_input_method_controller.cpp +++ b/frameworks/cj/src/cj_input_method_controller.cpp @@ -48,7 +48,9 @@ std::shared_ptr CjInputMethodController::GetInstance() if (controller_ == nullptr) { auto controller = std::make_shared(); controller_ = controller; - InputMethodController::GetInstance()->SetControllerListener(controller_); + if (InputMethodController::GetInstance() != nullptr){ + InputMethodController::GetInstance()->SetControllerListener(controller_); + } } } return controller_; -- Gitee From 6d176c7a6d573319350e7e01e563ff283d182fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=9F=8E=E8=8C=B6=E8=AF=AD?= Date: Tue, 22 Apr 2025 19:16:19 +0800 Subject: [PATCH 2/3] space MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小城茶语 --- frameworks/cj/src/cj_input_method_controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/cj/src/cj_input_method_controller.cpp b/frameworks/cj/src/cj_input_method_controller.cpp index b065db2b1..7bdc35a49 100644 --- a/frameworks/cj/src/cj_input_method_controller.cpp +++ b/frameworks/cj/src/cj_input_method_controller.cpp @@ -48,7 +48,7 @@ std::shared_ptr CjInputMethodController::GetInstance() if (controller_ == nullptr) { auto controller = std::make_shared(); controller_ = controller; - if (InputMethodController::GetInstance() != nullptr){ + if (InputMethodController::GetInstance() != nullptr) { InputMethodController::GetInstance()->SetControllerListener(controller_); } } -- Gitee From cd0db004395a23fbfac156c7d4274fd5da1551e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=9F=8E=E8=8C=B6=E8=AF=AD?= Date: Tue, 22 Apr 2025 20:57:01 +0800 Subject: [PATCH 3/3] space MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小城茶语 --- frameworks/cj/src/cj_input_method_controller.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frameworks/cj/src/cj_input_method_controller.cpp b/frameworks/cj/src/cj_input_method_controller.cpp index 7bdc35a49..a3cefe96c 100644 --- a/frameworks/cj/src/cj_input_method_controller.cpp +++ b/frameworks/cj/src/cj_input_method_controller.cpp @@ -48,8 +48,9 @@ std::shared_ptr CjInputMethodController::GetInstance() if (controller_ == nullptr) { auto controller = std::make_shared(); controller_ = controller; - if (InputMethodController::GetInstance() != nullptr) { - InputMethodController::GetInstance()->SetControllerListener(controller_); + auto inputMethodController = InputMethodController::GetInstance(); + if (inputMethodController != nullptr) { + inputMethodController->SetControllerListener(controller_); } } } -- Gitee