Fix #553:Desktop file without %f or %F crashes Geeqie
authorColin Clark <colin.clark@cclark.uk>
Fri, 8 Dec 2017 11:45:30 +0000 (11:45 +0000)
committerColin Clark <colin.clark@cclark.uk>
Fri, 8 Dec 2017 11:45:30 +0000 (11:45 +0000)
https://github.com/BestImageViewer/geeqie/issues/553

A .desktop file without %f or %F and is a filter, will crash Geeqie.
Check if filedata structure is null.

src/editors.c

index 1fee9c5..f8e5025 100644 (file)
@@ -1034,7 +1034,7 @@ static EditorFlags editor_command_one(const EditorDescription *editor, GList *li
                args[n++] = command;
                args[n] = NULL;
 
-               if ((ed->flags & EDITOR_DEST) && fd->change && fd->change->dest) /* FIXME: error handling */
+               if ((ed->flags & EDITOR_DEST) && fd && fd->change && fd->change->dest) /* FIXME: error handling */
                        {
                        g_setenv("GEEQIE_DESTINATION", fd->change->dest, TRUE);
                        }