From a0b8bcccb0daeec085eb612abb87834795af01d8 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 26 Jan 2012 22:46:15 +0100 Subject: feh --filelist: Do not overwrite filelist file if it is an image --- src/filelist.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/filelist.c') diff --git a/src/filelist.c b/src/filelist.c index 6439b9d..94baa06 100644 --- a/src/filelist.c +++ b/src/filelist.c @@ -460,10 +460,23 @@ gib_list *feh_read_filelist(char *filename) FILE *fp; gib_list *list = NULL; char s[1024], s1[1024]; + Imlib_Image tmp_im; + struct stat st; if (!filename) return(NULL); + /* + * feh_load_image will fail horribly if filename is not seekable + */ + if (!stat(filename, &st) && S_ISREG(st.st_mode) && + feh_load_image_char(&tmp_im, filename)) { + weprintf("Filelist file %s is an image, refusing to use it.\n" + "Did you mix up -f and -F?", filename); + opt.filelistfile = NULL; + return NULL; + } + errno = 0; if ((fp = fopen(filename, "r")) == NULL) { /* return quietly, as it's okay to specify a filelist file that doesn't -- cgit v1.2.3