diff options
author | Bert Münnich <ber.t@posteo.de> | 2017-11-23 14:35:32 +0100 |
---|---|---|
committer | Bert Münnich <ber.t@posteo.de> | 2017-11-23 14:35:34 +0100 |
commit | f02661879ff0efefc6751d927c2e721e64ad79f0 (patch) | |
tree | 863e487a8dbb6621616793adb762090eb10dbe38 /thumbs.c | |
parent | 9dabc5f9883b80286b91f73ea4dcf9fd3d1ad11c (diff) | |
download | nsxiv-f02661879ff0efefc6751d927c2e721e64ad79f0.tar.zst |
Reject text files resembling TGA images
Fixes issue #295
The imlib2 TGA loader returns an imlib image handle without any actual data
when given a text file like this:
T
Content-Type: application/javascript
Content-Length: 3836
Last-Modified: Wed, 23 Sep 2015 12:25:47 GMT
Etag: "56029a4b-efc"
Expires: Sat, 20 Aug 2016 15:14:33 GMT
Cache-Control: max-age=604800, public
Accept-Ranges: bytes
Fortunately, `imlib_image_get_data()` returns NULL in this case, so that we can
use it as an additional check when opening files.
Diffstat (limited to 'thumbs.c')
-rw-r--r-- | thumbs.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -32,6 +32,7 @@ #include <libexif/exif-data.h> void exif_auto_orientate(const fileinfo_t*); #endif +Imlib_Image img_open(const fileinfo_t*); static char *cache_dir; @@ -237,7 +238,6 @@ bool tns_load(tns_t *tns, int n, bool force, bool cache_only) char *cfile; thumb_t *t; fileinfo_t *file; - struct stat st; Imlib_Image im = NULL; if (n < 0 || n >= *tns->cnt) @@ -331,14 +331,8 @@ bool tns_load(tns_t *tns, int n, bool force, bool cache_only) } if (im == NULL) { - if (access(file->path, R_OK) == -1 || - stat(file->path, &st) == -1 || !S_ISREG(st.st_mode) || - (im = imlib_load_image(file->path)) == NULL) - { - if (file->flags & FF_WARN) - error(0, 0, "%s: Error opening image", file->name); + if ((im = img_open(file)) == NULL) return false; - } } imlib_context_set_image(im); |