dwrite: Avoid possible out-of-bounds cluster metrics access.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45535Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Avoid possible out-of-bounds cluster metrics access.
470ed3c5 · Nikolay Sivov · Alexandre Julliard · 8ad509ed · 470ed3c5
Commit 470ed3c5 authored Aug 13, 2018 by Nikolay Sivov Committed by Alexandre Julliard Aug 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

layout.c dlls/dwrite/layout.c +1 -1

No files found.
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -2089,7 +2089,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout)
    */
    if (layout->len == 0)
        hr = layout_set_dummy_line_metrics(layout, 0);
-    else if (layout->clustermetrics[layout->cluster_count - 1].isNewline)
+    else if (layout->cluster_count && layout->clustermetrics[layout->cluster_count - 1].isNewline)
        hr = layout_set_dummy_line_metrics(layout, layout->len - 1);
    if (FAILED(hr))
        return hr;