Skip to content

Fix for Issue #750 - potential crash if we remove current (invalid) file from list #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for Issue #750 - potential crash if we remove current (invalid) file from list #782

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/slideshow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ void slideshow_change_image(winwidget winwid, int change, int render)
break;
}

if (last) {
/* Ignore an errored file in future, if possible (and safe) */
if (last && last != current_file) {
filelist = feh_file_remove_from_list(filelist, last);
last = NULL;
}
Expand All @@ -336,27 +337,26 @@ void slideshow_change_image(winwidget winwid, int change, int render)
}

if (winwidget_loadimage(winwid, FEH_FILE(current_file->data))) {
int w = gib_imlib_image_get_width(winwid->im);
int h = gib_imlib_image_get_height(winwid->im);
if (feh_should_ignore_image(winwid->im)) {
last = current_file;
continue;
}
winwid->mode = MODE_NORMAL;
winwid->file = current_file;
if ((winwid->im_w != w) || (winwid->im_h != h))
winwid->had_resize = 1;
winwidget_reset_image(winwid);
winwid->im_w = w;
winwid->im_h = h;
if (render) {
winwidget_render_image(winwid, 1, 0);
if (!feh_should_ignore_image(winwid->im)) {
int w = gib_imlib_image_get_width(winwid->im);
int h = gib_imlib_image_get_height(winwid->im);
winwid->mode = MODE_NORMAL;
winwid->file = current_file;
if ((winwid->im_w != w) || (winwid->im_h != h))
winwid->had_resize = 1;
winwidget_reset_image(winwid);
winwid->im_w = w;
winwid->im_h = h;
if (render) {
winwidget_render_image(winwid, 1, 0);
}
break; /* Happy path */
}
break;
} else
last = current_file;
}

last = current_file;
}
if (last)
if (last && last != current_file)
filelist = feh_file_remove_from_list(filelist, last);

if (filelist_len == 0)
Expand Down