Skip to content
Snippets Groups Projects
Commit c1e1b090 authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/trivial_change_portal' into 'master'

xdg-portal: Guard against a possible NULL local_error

See merge request !225
parents 750875f1 20cb147c
No related branches found
No related tags found
1 merge request!225xdg-portal: Guard against a possible NULL local_error
Pipeline #7822 passed
......@@ -611,7 +611,8 @@ _srt_check_xdg_portals (gchar **envp,
g_debug ("The helper output is not a JSON object");
issues |= SRT_XDG_PORTAL_ISSUES_UNKNOWN;
if (details_out != NULL)
*details_out = _srt_xdg_portal_new (local_error->message, issues, NULL, NULL);
*details_out = _srt_xdg_portal_new ("Helper output is not a JSON object",
issues, NULL, NULL);
return issues;
}
......@@ -622,7 +623,8 @@ _srt_check_xdg_portals (gchar **envp,
g_debug ("The helper output JSON is malformed or incomplete");
issues |= SRT_XDG_PORTAL_ISSUES_UNKNOWN;
if (details_out != NULL)
*details_out = _srt_xdg_portal_new (local_error->message, issues, NULL, NULL);
*details_out = _srt_xdg_portal_new ("Helper output does not contain 'interfaces'",
issues, NULL, NULL);
return issues;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment