commit 3a9d28f0198e78754902e3bb8617804086538f30
author Ozkan Sezer <sezeroz@gmail.com> Fri Nov 20 12:20:02 2020 +0300
committer Ozkan Sezer <sezeroz@gmail.com> Fri Nov 20 12:20:02 2020 +0300
tree 60d649f57e3b46933f4c8ab4e49f6f3990f06213
parent 9c93d9e85c617418e0b75ac10c4e5f7b2849d989

SDL_os2messagebox.c (_makeDlg): fix crash if title and/or message is NULL.

c.f.: bug #5253.

Xcode/SDL/SDL.xcodeproj/project.pbxproj

diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
old mode 100755
new mode 100644

src/video/os2/SDL_os2messagebox.c

diff --git a/src/video/os2/SDL_os2messagebox.c b/src/video/os2/SDL_os2messagebox.c
index e3b9267..e82b8d3 100644
--- a/src/video/os2/SDL_os2messagebox.c
+++ b/src/video/os2/SDL_os2messagebox.c
@@ -205,9 +205,12 @@
         pSDLBtnData =  (SDL_MessageBoxButtonData *)messageboxdata->buttons;
     ULONG               cSDLBtnData = messageboxdata->numbuttons;
 
-    PSZ                 pszTitle = OS2_UTF8ToSys((PSZ) messageboxdata->title);
+    PSZ                 pszTitle = (messageboxdata->title == NULL)? NULL :
+                                    OS2_UTF8ToSys((PSZ) messageboxdata->title);
     ULONG               cbTitle = (pszTitle == NULL)? 0 : strlen(pszTitle);
-    PSZ                 pszText = OS2_UTF8ToSys((PSZ) messageboxdata->message);
+
+    PSZ                 pszText = (messageboxdata->message == NULL)? NULL :
+                                   OS2_UTF8ToSys((PSZ) messageboxdata->message);
     ULONG               cbText = (pszText == NULL)? 0 : strlen(pszText);
 
     PDLGTEMPLATE        pTemplate;