[PATCH] dwrite/layout: Fix invalid index access to cluster array.

Nikolay Sivov nsivov at codeweavers.com
Mon Apr 15 10:22:46 CDT 2019


Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45543
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/dwrite/layout.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 4cd5ce445f..d101a5a197 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -1853,6 +1853,9 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust
 
         metrics.trailingWhitespaceLength += cluster->length;
         trailingspacewidth += cluster->width;
+
+        if (index == 0)
+            break;
     }
 
     /* Line metrics length includes trailing whitespace length too */
-- 
2.20.1




More information about the wine-devel mailing list