openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-23 06:40:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix:check null pointer before access

Browse Source 
Signed-off-by: wuchengwen <wuchengwen4@huawei.com>
This commit is contained in:
wuchengwen 2024-10-16 10:46:38 +08:00
parent 0959ba8141
commit ca1575096d
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
frameworks/ndk/src/inputmethod_controller_capi.cpp
View File

@ -53,7 +53,7 @@ InputMethod_ErrorCode IsValidInputMethodProxy(InputMethod_InputMethodProxy *inpu
return IME_ERR_PARAMCHECK;
}
if (g_inputMethodProxy->attached == false) {
if (!(g_inputMethodProxy->attached)) {
IMSA_HILOGE("g_inputMethodProxy is not attached");
return IME_ERR_DETACHED;
}
@ -118,22 +118,8 @@ static int32_t IsValidTextEditorProxy(InputMethod_TextEditorProxy *textEditor)
return IME_ERR_OK;
}
InputMethod_ErrorCode OH_InputMethodController_Attach(InputMethod_TextEditorProxy *textEditor,
InputMethod_AttachOptions *options, InputMethod_InputMethodProxy **inputMethodProxy)
static TextConfig ConstructTextConfig(const InputMethod_TextConfig& config)
{
if ((IsValidTextEditorProxy(textEditor) != IME_ERR_OK) || options == nullptr || inputMethodProxy == nullptr) {
IMSA_HILOGE("invalid parameter");
return IME_ERR_NULL_POINTER;
}
InputMethod_ErrorCode errCode = GetInputMethodProxy(textEditor);
if (errCode != IME_ERR_OK) {
return errCode;
}
InputMethod_TextConfig config;
textEditor->getTextConfigFunc(textEditor, &config);
TextConfig textConfig = {
.inputAttribute = {
.inputPattern = static_cast<InputMethod_TextInputType>(config.inputType),
@ -155,11 +141,34 @@ InputMethod_ErrorCode OH_InputMethodController_Attach(InputMethod_TextEditorProx
.height = config.avoidInfo.height,
};
return textConfig;
}
InputMethod_ErrorCode OH_InputMethodController_Attach(InputMethod_TextEditorProxy *textEditor,
InputMethod_AttachOptions *options, InputMethod_InputMethodProxy **inputMethodProxy)
{
if ((IsValidTextEditorProxy(textEditor) != IME_ERR_OK) || options == nullptr || inputMethodProxy == nullptr) {
IMSA_HILOGE("invalid parameter");
return IME_ERR_NULL_POINTER;
}
InputMethod_ErrorCode errCode = GetInputMethodProxy(textEditor);
if (errCode != IME_ERR_OK) {
return errCode;
}
InputMethod_TextConfig config;
textEditor->getTextConfigFunc(textEditor, &config);
auto textConfig = ConstructTextConfig(config);
auto controller = InputMethodController::GetInstance();
OHOS::sptr<NativeTextChangedListener> listener = nullptr;
{
std::lock_guard<std::mutex> guard(g_textEditorProxyMapMutex);
listener = g_inputMethodProxy->listener;
if (g_inputMethodProxy != nullptr) {
listener = g_inputMethodProxy->listener;
}
}
int32_t err = controller->Attach(listener, options->showKeyboard, textConfig);