* macterm.h (cfstring_create_with_utf8_cstring): Added prototype.

* image.c (image_load_quartz2d): Use
cfstring_create_with_utf8_cstring
* macmenu.c (add_menu_item): Use
cfstring_create_with_utf8_cstring
* macfns.c (x_set_name, x_set_title): Use
cfstring_create_with_utf8_cstring
(Fx_file_dialog): Use cfstring_create_with_utf8_cstring and use
constant CFRefs instead of creating them each time for labels.
* mac.c (cfstring_create_with_utf8_cstring): Added to prevent
crashes with invalid characters.

1 files changed, 2 insertions, 11 deletions

diff --git a/src/macmenu.c b/src/macmenu.c
index af24cfe237c..f0696a49774 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -2264,17 +2264,8 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
       item_name[255] = 0;
 #if TARGET_API_MAC_CARBON
       {
-        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);
-          }
-        
+        CFStringRef string = cfstring_create_with_utf8_cstring (item_name);
+
         SetMenuItemTextWithCFString (menu, pos, string);
         CFRelease (string);
       }