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

gosxappinfo: Add some more precondition checks

Browse Source 
These might help catch the problem in #2119 earlier on, and provide more
information about its root cause.

They should not affect behaviour in normal application usage.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #2119
This commit is contained in:
Philip Withnall 2020-12-09 11:44:37 +00:00
parent 2a629b3b4b
commit a9fc7e5935
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gio/gosxappinfo.m
View File

@ -168,6 +168,7 @@ get_bundle_string_value (NSBundle *bundle,
static CFStringRef static CFStringRef
create_cfstring_from_cstr (const gchar *cstr) create_cfstring_from_cstr (const gchar *cstr)
{ {
g_return_val_if_fail (cstr != NULL, NULL);
return CFStringCreateWithCString (NULL, cstr, kCFStringEncodingUTF8); return CFStringCreateWithCString (NULL, cstr, kCFStringEncodingUTF8);
} }
@ -279,8 +280,14 @@ create_urlspec_for_appinfo (GOsxAppInfo *info,
GList *uris, GList *uris,
gboolean are_files) gboolean are_files)
{ {
LSLaunchURLSpec *urlspec = g_new0 (LSLaunchURLSpec, 1); LSLaunchURLSpec *urlspec = NULL;
const gchar *app_cstr = g_osx_app_info_get_filename (info); const gchar *app_cstr;
g_return_val_if_fail (G_IS_OSX_APP_INFO (info), NULL);
urlspec = g_new0 (LSLaunchURLSpec, 1);
app_cstr = g_osx_app_info_get_filename (info);
g_assert (app_cstr != NULL);
/* Strip file:// from app url but ensure filesystem url */ /* Strip file:// from app url but ensure filesystem url */
urlspec->appURL = create_url_from_cstr (app_cstr + strlen ("file://"), TRUE); urlspec->appURL = create_url_from_cstr (app_cstr + strlen ("file://"), TRUE);
@ -460,9 +467,14 @@ g_osx_app_info_launch_internal (GAppInfo *appinfo,
GError **error) GError **error)
{ {
GOsxAppInfo *info = G_OSX_APP_INFO (appinfo); GOsxAppInfo *info = G_OSX_APP_INFO (appinfo);
LSLaunchURLSpec *urlspec = create_urlspec_for_appinfo (info, uris, are_files); LSLaunchURLSpec *urlspec;
gint ret, success = TRUE; gint ret, success = TRUE;
g_return_val_if_fail (G_IS_OSX_APP_INFO (appinfo), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
urlspec = create_urlspec_for_appinfo (info, uris, are_files);
if ((ret = LSOpenFromURLSpec (urlspec, NULL))) if ((ret = LSOpenFromURLSpec (urlspec, NULL)))
{ {
/* TODO: Better error codes */ /* TODO: Better error codes */