* 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, 1 insertions, 2 deletions

diff --git a/src/image.c b/src/image.c
index 4ab672ca58e..d1925cf36e4 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2416,8 +2416,7 @@ image_load_quartz2d (f, img, png_p)
           UNGCPRO;
           return 0;
         }
-      path = CFStringCreateWithCString (NULL, SDATA (file),
-                                        kCFStringEncodingUTF8);
+      path = cfstring_create_with_utf8_cstring (SDATA (file));
       url = CFURLCreateWithFileSystemPath (NULL, path,
                                            kCFURLPOSIXPathStyle, 0);
       CFRelease (path);