luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 04:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

MacOS: create_cstr_from_cfstring uses safe conversion - use CFStringGetCString

Browse Source 
During testing with gdk-pixbuf I noticed failures during content type
to mime conversion. The root reason was the unsafe conversion used
in create_cstr_from_cfstring. The problem was addressed in commit
c60226e0a1cae40a96 but that was reverted. I noticed the commit only
when I had fixed the problem. In addition I added a test to check
the content type to mime conversion on MacOS. This problem is
discussed in Bug #788936.

See: https://bugzilla.gnome.org/show_bug.cgi?id=788936
This commit is contained in:
Friedrich Beckmann 2017-10-15 13:16:44 +02:00 committed by Philip Withnall
parent df7e4db65a
commit 2bd423c54c
3 changed files with 56 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gio/gosxappinfo.c
View File

@ -171,19 +171,26 @@ create_cfstring_from_cstr (const gchar *cstr)
return CFStringCreateWithCString (NULL, cstr, kCFStringEncodingUTF8); return CFStringCreateWithCString (NULL, cstr, kCFStringEncodingUTF8);
} }
#ifdef G_ENABLE_DEBUG
static gchar * static gchar *
create_cstr_from_cfstring (CFStringRef str) create_cstr_from_cfstring (CFStringRef str)
{ {
const gchar *cstr; g_return_val_if_fail (str != NULL, NULL);
if (str == NULL) CFIndex length = CFStringGetLength (str);
return NULL; CFIndex maxlen = CFStringGetMaximumSizeForEncoding (length, kCFStringEncodingUTF8);
gchar *buffer = g_malloc (maxlen + 1);
cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8); Boolean success = CFStringGetCString (str, (char *) buffer, maxlen,
CFRelease (str); kCFStringEncodingUTF8);
if (success)
return g_strdup (cstr); return buffer;
else
{
g_free (buffer);
return NULL;
}
} }
#endif
static char * static char *
url_escape_hostname (const char *url) url_escape_hostname (const char *url)

20
gio/gosxcontenttype.c
View File

@ -58,15 +58,21 @@ create_cfstring_from_cstr (const gchar *cstr)
static gchar * static gchar *
create_cstr_from_cfstring (CFStringRef str) create_cstr_from_cfstring (CFStringRef str)
{ {
const gchar *cstr; g_return_val_if_fail (str != NULL, NULL);
if (str == NULL) CFIndex length = CFStringGetLength (str);
return NULL; CFIndex maxlen = CFStringGetMaximumSizeForEncoding (length, kCFStringEncodingUTF8);
gchar *buffer = g_malloc (maxlen + 1);
cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8); Boolean success = CFStringGetCString (str, (char *) buffer, maxlen,
kCFStringEncodingUTF8);
CFRelease (str); CFRelease (str);
if (success)
return g_strdup (cstr); return buffer;
else
{
g_free (buffer);
return NULL;
}
} }
/*< internal > /*< internal >

28
gio/tests/contenttype.c
View File

@ -361,6 +361,33 @@ test_guess_svg_from_data (void)
g_free (res); g_free (res);
} }
static void
test_mime_from_content (void)
{
#ifdef __APPLE__
gchar *mime_type;
mime_type = g_content_type_get_mime_type ("com.microsoft.bmp");
g_assert_cmpstr (mime_type, ==, "image/bmp");
g_free (mime_type);
mime_type = g_content_type_get_mime_type ("com.compuserve.gif");
g_assert_cmpstr (mime_type, ==, "image/gif");
g_free (mime_type);
mime_type = g_content_type_get_mime_type ("public.png");
g_assert_cmpstr (mime_type, ==, "image/png");
g_free (mime_type);
mime_type = g_content_type_get_mime_type ("public.text");
g_assert_cmpstr (mime_type, ==, "text/*");
g_free (mime_type);
mime_type = g_content_type_get_mime_type ("public.svg-image");
g_assert_cmpstr (mime_type, ==, "image/svg+xml");
g_free (mime_type);
#elif defined(G_OS_WIN32)
g_test_skip ("mime from content type test not implemented on WIN32");
#else
g_test_skip ("mime from content type test not implemented on UNIX");
#endif
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -370,6 +397,7 @@ main (int argc, char *argv[])
g_test_add_func ("/contenttype/guess", test_guess); g_test_add_func ("/contenttype/guess", test_guess);
g_test_add_func ("/contenttype/guess_svg_from_data", test_guess_svg_from_data); g_test_add_func ("/contenttype/guess_svg_from_data", test_guess_svg_from_data);
g_test_add_func ("/contenttype/mime_from_content", test_mime_from_content);
g_test_add_func ("/contenttype/unknown", test_unknown); g_test_add_func ("/contenttype/unknown", test_unknown);
g_test_add_func ("/contenttype/subtype", test_subtype); g_test_add_func ("/contenttype/subtype", test_subtype);
g_test_add_func ("/contenttype/list", test_list); g_test_add_func ("/contenttype/list", test_list);