Fix [53d28027e3]: Generate an error instead of a crash if wm iconphoto receives an invalid photo image.

2 files changed, 9 insertions, 2 deletions

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 5714bf4..3f7ca0a 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -501,9 +501,12 @@ TkMacOSXGetNSImageWithTkImage(
     int width,
     int height)
 {
-    Pixmap pixmap = Tk_GetPixmap(display, None, width, height, 0);
+    Pixmap pixmap;
     NSImage *nsImage;
-
+    if (width == 0 | height == 0) {
+	return NULL;
+    }
+    pixmap = Tk_GetPixmap(display, None, width, height, 0);
     Tk_RedrawImage(image, 0, 0, width, height, pixmap, 0, 0);
     nsImage = CreateNSImageWithPixmap(pixmap, width, height);
     Tk_FreePixmap(display, pixmap);
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index c2b67f6..40fca11 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -2569,6 +2569,10 @@ WmIconphotoCmd(
 	    width, height);
     Tk_FreeImage(tk_icon);
     if (newIcon == NULL) {
+    	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+	      "Failed to create an NSImage from \"%s\".",
+	      icon));
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "PHOTO", NULL);
 	return TCL_ERROR;
     }
     [NSApp setApplicationIconImage: newIcon];