summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2021-06-21 18:52:18 +0200
committerGitHub <noreply@github.com>2021-06-21 18:52:18 +0200
commit87d9b7edb0e348c606d0d064e8db998ee9cec208 (patch)
treed243a0815fdef1e8b10129c9eca75edaa841d507 /src
parentbc372c8faddd396b2d07470139b62290f499881f (diff)
parent0e4592a5e39261ef02c8502f92703b128ad59ffc (diff)
Merge pull request #615 from DavidBuchanan314/master
Fix feh_is_image for tiny (<16 byte) image files
Diffstat (limited to 'src')
-rw-r--r--src/imlib.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imlib.c b/src/imlib.c
index 3a7cb6d..6f31e96 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -253,7 +253,9 @@ int feh_is_image(feh_file * file)
if (!fh) {
return 0;
}
- if (fread(buf, 1, 16, fh) != 16) {
+ // Files smaller than buf will be padded with zeroes
+ memset(buf, 0, sizeof(buf));
+ if (fread(buf, 1, 16, fh) <= 0) {
fclose(fh);
return 0;
}