* macmenu.c (add_menu_item): Fallback on MacRoman if encoding

menu text as UTF8 fails.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/macmenu.c b/src/macmenu.c
index 007fab15eab..af24cfe237c 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -2267,6 +2267,14 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
         CFStringRef string =
           CFStringCreateWithCString (NULL, item_name, kCFStringEncodingUTF8);
 
+        if (string == NULL)
+          {
+            /* Failed to interpret as UTF8.  Fall back to Mac Roman.
+               Maybe wv->name is corrupted?  */
+            string = CFStringCreateWithCString (NULL, item_name,
+                                                kCFStringEncodingMacRoman);
+          }
+        
         SetMenuItemTextWithCFString (menu, pos, string);
         CFRelease (string);
       }