eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 17:52:42 +02:00
Code Issues Releases Activity

Issue #3093 - Invalid characters in Open Location dialog crashes GIMP

Browse Source 
file_open_location_response(): guard against g_file_new_for_uri()
returning NULL (which it shouldn't) and an error being NULL (which it
shouldn't either for the same reason). Spotted by Massimo.
This commit is contained in:
Michael Natterer
2019-06-29 13:14:14 +02:00
parent 382fe030ce
commit cf8148df5e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/dialogs/file-open-location-dialog.c
View File

@@ -198,6 +198,10 @@ file_open_location_response (GtkDialog *dialog,
{ {
GFile *entered_file = g_file_new_for_uri (text); GFile *entered_file = g_file_new_for_uri (text);
/* should not fail but does, see issue #3093 */
if (! entered_file)
entered_file = g_object_ref (file);
gtk_widget_show (box); gtk_widget_show (box);
gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE); gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
@@ -236,7 +240,9 @@ file_open_location_response (GtkDialog *dialog,
{ {
gimp_message (gimp, G_OBJECT (box), GIMP_MESSAGE_ERROR, gimp_message (gimp, G_OBJECT (box), GIMP_MESSAGE_ERROR,
_("Opening '%s' failed:\n\n%s"), _("Opening '%s' failed:\n\n%s"),
text, error->message); text,
/* error should never be NULL, also issue #3093 */
error ? error->message : _("Invalid URI"));
g_clear_error (&error); g_clear_error (&error);
} }
} }