Skip to content

W
wine-cw
Commit 331bf3d7 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Avoid trouble in WM_GETTEXT if specified length is larger than the

buffer (found by Carl Sopchak).
parent ebd110bc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
controls/edit.c
View file @ 331bf3d7
...@@ -3962,15 +3962,14 @@ static INT EDIT_WM_GetText(EDITSTATE *es, INT count, LPARAM lParam, BOOL unicode ...@@ -3962,15 +3962,14 @@ static INT EDIT_WM_GetText(EDITSTATE *es, INT count, LPARAM lParam, BOOL unicode
if(unicode) if(unicode)
{ {
LPWSTR textW = (LPWSTR)lParam; LPWSTR textW = (LPWSTR)lParam;
strncpyW(textW, es->text, count); lstrcpynW(textW, es->text, count);
textW[count - 1] = 0; /* ensure 0 termination */
return strlenW(textW); return strlenW(textW);
} }
else else
{ {
LPSTR textA = (LPSTR)lParam; LPSTR textA = (LPSTR)lParam;
WideCharToMultiByte(CP_ACP, 0, es->text, -1, textA, count, NULL, NULL); if (!WideCharToMultiByte(CP_ACP, 0, es->text, -1, textA, count, NULL, NULL))
textA[count - 1] = 0; /* ensure 0 termination */ textA[count - 1] = 0; /* ensure 0 termination */
return strlen(textA); return strlen(textA);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment