[PATCH 0/1] MR5800: gdi32/text: Handle null partial extents pointer in GetTextExtentExPointW().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56788 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5800
From: Nikolay Sivov <nsivov(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56788 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/text.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 085c5e3afbe..ff548306dc3 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1421,8 +1421,11 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, const WCHAR *str, INT count, INT max if (extents + cluster_extent > max_ext) break; if (nfit) *nfit += cluster_size; - for (j = 0; j < cluster_size; ++j) - dxs[i + j] = extents + cluster_extent / cluster_size; + if (dxs) + { + for (j = 0; j < cluster_size; ++j) + dxs[i + j] = extents + cluster_extent / cluster_size; + } extents += cluster_extent; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5800
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5800
participants (3)
-
Huw Davies (@huw) -
Nikolay Sivov -
Nikolay Sivov (@nsivov)