luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[MacOS] Fallback to CFStringGetCSTring if CFStringGetCStringPtr fails."

Browse Source 
This reverts commit c60226e0a1.

Pushed without review. This should be reviewed on bug #788936 first.
Several issues with the patch:
 • Takes the string length unnecessarily early.
 • Calls CFRelease(str) before g_strdup(cstr) which could lead to
   use-after-free.
 • Code style issues.
 • Don’t want to encourage pushing patches without review.
This commit is contained in:
Philip Withnall 2017-10-14 09:04:43 +01:00
parent c60226e0a1
commit 13c6d9fedf
2 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gio/gosxappinfo.c
View File

@ -175,44 +175,14 @@ static gchar *
create_cstr_from_cfstring (CFStringRef str) create_cstr_from_cfstring (CFStringRef str)
{ {
const gchar *cstr; const gchar *cstr;
CFIndex length = CFStringGetLength (str);
char *buffer = NULL;
if (str == NULL) if (str == NULL)
return NULL; return NULL;
cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8); cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8);
/* CFStringGetCStringPtr returns "NULL if the internal storage of
* theString does not allow [a pointer] to be returned efficiently".
* (Apple's docs don't say what that means). In that case we must
* use CFStringGetCString as a fallback.
*/
if (cstr != NULL)
{
CFRelease (str); CFRelease (str);
return g_strdup (cstr); return g_strdup (cstr);
}
buffer = g_malloc0 (length + 1);
/* Start off with a buffer size sufficient for the most likely case
* that the CFString is ASCII so the UTF8 representation will be 1
* byte per code point. Keep trying up to 4 bytes per code point,
* the max allowed by RFC3629.
*/
for (int i = 1; i <= 4; ++i)
{
if (CFStringGetCString (str, buffer, length, kCFStringEncodingUTF8))
{
CFRelease (str);
return buffer;
}
length += length;
buffer = g_realloc (buffer, length + 1);
}
g_free (buffer);
CFRelease (str);
return NULL;
} }
static char * static char *

32
gio/gosxcontenttype.c
View File

@ -53,44 +53,14 @@ static gchar *
create_cstr_from_cfstring (CFStringRef str) create_cstr_from_cfstring (CFStringRef str)
{ {
const gchar *cstr; const gchar *cstr;
CFIndex length = CFStringGetLength (str);
char *buffer = NULL;
if (str == NULL) if (str == NULL)
return NULL; return NULL;
cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8); cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8);
/* CFStringGetCStringPtr returns "NULL if the internal storage of
* theString does not allow [a pointer] to be returned efficiently".
* (Apple's docs don't say what that means). In that case we must
* use CFStringGetCString as a fallback.
*/
if (cstr != NULL)
{
CFRelease (str); CFRelease (str);
return g_strdup (cstr); return g_strdup (cstr);
}
buffer = g_malloc0 (length + 1);
/* Start off with a buffer size sufficient for the most likely case
* that the CFString is ASCII so the UTF8 representation will be 1
* byte per code point. Keep trying up to 4 bytes per code point,
* the max allowed by RFC3629.
*/
for (int i = 1; i <= 4; ++i)
{
if (CFStringGetCString (str, buffer, length, kCFStringEncodingUTF8))
{
CFRelease (str);
return buffer;
}
length += length;
buffer = g_realloc (buffer, length + 1);
}
g_free (buffer);
CFRelease (str);
return NULL;
} }
/*< internal > /*< internal >