Module: wine Branch: master Commit: 36c9ac3968bf99f9e2fc7804d393568a82f6bdaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c9ac3968bf99f9e2fc7804d3... Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 6 22:06:15 2017 +0000 gdiplus: Check for null in GdipGetFontHeight. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 1068a47..ccf93ed 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -558,6 +558,8 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, TRACE("%p %p %p\n", font, graphics, height); + if (!font || !height) return InvalidParameter; + stat = GdipGetFontHeightGivenDPI(font, font->family->dpi, &font_height); if (stat != Ok) return stat;