From 2f016cf88d96f10320cff49ca128f9519380c6ba Mon Sep 17 00:00:00 2001 From: Philipp Wiesemann Date: Sun, 26 Jun 2016 21:08:57 +0200 Subject: [PATCH] Mac: Fixed crash if SDL_GetDisplayDPI() got NULL pointers for output parameters. --- src/video/cocoa/SDL_cocoamodes.m | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/video/cocoa/SDL_cocoamodes.m b/src/video/cocoa/SDL_cocoamodes.m index 6d29c6be51051..6df1e496b5c98 100644 --- a/src/video/cocoa/SDL_cocoamodes.m +++ b/src/video/cocoa/SDL_cocoamodes.m @@ -323,9 +323,15 @@ size_t pixelWidth = CGDisplayPixelsWide(data->display); size_t pixelHeight = CGDisplayPixelsHigh(data->display); - *ddpi = SDL_ComputeDiagonalDPI(pixelWidth, pixelHeight, displaySize.width / MM_IN_INCH, displaySize.height / MM_IN_INCH); - *hdpi = pixelWidth * MM_IN_INCH / displaySize.width; - *vdpi = pixelHeight * MM_IN_INCH / displaySize.height; + if (ddpi) { + *ddpi = SDL_ComputeDiagonalDPI(pixelWidth, pixelHeight, displaySize.width / MM_IN_INCH, displaySize.height / MM_IN_INCH); + } + if (hdpi) { + *hdpi = pixelWidth * MM_IN_INCH / displaySize.width; + } + if (vdpi) { + *vdpi = pixelHeight * MM_IN_INCH / displaySize.height; + } return 0; }