diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-09-08 07:57:45 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-09-08 07:57:45 +0000 |
| commit | f5428eddcd9d7f0091a44baa205f2f9b5a9dda5c (patch) | |
| tree | 8289e33287abab6a1afb410faf5f8bfb7698d9fb /version_info.c | |
| parent | 001dbcfc0b168c5180c452cd3535438ad76a9237 (diff) | |
OK, fine, g_malloc() and g_free(). We really should be using
g_try_free(), because, trust me, we *can* handle allocation failures
here.
svn path=/trunk/; revision=44813
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/version_info.c b/version_info.c index 60021c7705..3b6a7afe2f 100644 --- a/version_info.c +++ b/version_info.c @@ -204,13 +204,10 @@ get_string_from_dictionary(CFPropertyListRef dict, CFStringRef key) } string_len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstring), kCFStringEncodingUTF8); - string = malloc(string_len + 1); - if (string == NULL) { - return NULL; - } + string = g_malloc(string_len + 1); if (!CFStringGetCString(cfstring, string, string_len + 1, kCFStringEncodingUTF8)) { - free(string); + g_free(string); return NULL; } return string; @@ -287,7 +284,7 @@ get_os_x_version_info(GString *str) return FALSE; } g_string_append_printf(str, "OS X %s", string); - free(string); + g_free(string); /* Get the build string */ string = get_string_from_dictionary(system_version_dict, @@ -299,7 +296,7 @@ get_os_x_version_info(GString *str) return FALSE; } g_string_append_printf(str, ", build %s", string); - free(string); + g_free(string); CFRelease(system_version_dict); CFReadStreamClose(system_version_plist_stream); CFRelease(system_version_plist_stream); |