gdiplus: Handle large input rect in GdipMeasureCharacterRanges.

6b97abf9 · Vincent Povirk · Alexandre Julliard · 6ee26aca · 6b97abf9
Commit 6b97abf9 authored Mar 23, 2015 by Vincent Povirk Committed by Alexandre Julliard Mar 24, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

graphics.c dlls/gdiplus/graphics.c +3 -0

No files found.
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -4739,6 +4739,9 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,
    scaled_rect.Width = layoutRect->Width * args.rel_width;
    scaled_rect.Height = layoutRect->Height * args.rel_height;

+    if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23;
+    if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23;
+
    get_font_hfont(graphics, font, stringFormat, &gdifont, NULL);
    oldfont = SelectObject(hdc, gdifont);