[PATCH 0/1] MR5800: gdi32/text: Handle null partial extents pointer in GetTextExtentExPointW().

[Nikolay Sivov (＠nsivov)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56788
Signed-off-by: Nikolay Sivov

[PATCH 1/1] gdi32/text: Handle null partial extents pointer in GetTextExtentExPointW().

[Nikolay Sivov]

From: Nikolay Sivov

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56788
Signed-off-by: Nikolay Sivov 
---
 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;
             }

[PATCH 0/1] MR5800: gdi32/text: Handle null partial extents pointer in GetTextExtentExPointW(). - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.