From 8b3663d2b6352de99c63586fed6dc71933f5e8db Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 24 Mar 2026 06:50:16 +0900 Subject: [PATCH] [IMM32] ImmGetGuideLineAW: Fix return value for error (#8766) The function has to return zero on error. JIRA issue: CORE-19268 Return zero on error (in GGL_STRING and GGL_PRIVATE). --- win32ss/user/imm32/guideline.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/win32ss/user/imm32/guideline.c b/win32ss/user/imm32/guideline.c index a679e816e1e..c5bffd47dae 100644 --- a/win32ss/user/imm32/guideline.c +++ b/win32ss/user/imm32/guideline.c @@ -88,11 +88,16 @@ ImmGetGuideLineAW( } } - if (dwBufLen == 0 || cb == 0 || lpBuf == NULL || dwBufLen < cb) + if (dwBufLen == 0) { ret = cb; goto Quit; } + if (cb == 0 || lpBuf == NULL || dwBufLen < cb) + { + ret = 0; /* Error */ + goto Quit; + } /* store to buffer */ if (bAnsi) @@ -149,11 +154,16 @@ ImmGetGuideLineAW( } } - if (dwBufLen == 0 || cb == 0 || lpBuf == NULL || dwBufLen < cb) + if (dwBufLen == 0) { ret = cb; goto Quit; } + if (cb == 0 || lpBuf == NULL || dwBufLen < cb) + { + ret = 0; /* Error */ + goto Quit; + } /* store to buffer */ if (bAnsi)