kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=d812457afe477ef75365b8d83b9f87b3960342f2
commit d812457afe477ef75365b8d83b9f87b3960342f2 Author: Kim Woelders <[email protected]> Date: Tue Oct 19 13:43:04 2021 +0200 XBM loader: Ignore comments and other stuff in header Add naive signature check to avoid trivial cases where we might otherwise scan through large non-xbm file. --- src/modules/loaders/loader_xbm.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/modules/loaders/loader_xbm.c b/src/modules/loaders/loader_xbm.c index f2040bf..0963384 100644 --- a/src/modules/loaders/loader_xbm.c +++ b/src/modules/loaders/loader_xbm.c @@ -1,6 +1,7 @@ /* * XBM loader */ +#define _GNU_SOURCE /* memmem() */ #include "loader_common.h" #include <sys/mman.h> @@ -92,10 +93,20 @@ load2(ImlibImage * im, int load_data) rc = LOAD_FAIL; + if (im->fsize < 64) + return rc; /* Not XBM */ + fdata = mmap(NULL, im->fsize, PROT_READ, MAP_SHARED, fileno(im->fp), 0); if (fdata == MAP_FAILED) return rc; + /* Signature check ("#define") allow longish initial comment */ + s = fdata; + nlen = s[0] == '/' && s[1] == '*' ? 4096 : 256; + nlen = im->fsize > nlen ? nlen : im->fsize; + if (!memmem(s, nlen, "#define", 7)) + goto quit; + mm_init(fdata, im->fsize); ptr = NULL; @@ -134,7 +145,7 @@ load2(ImlibImage * im, int load_data) im->h = val; } } - else if (strcmp(tok1, "static") == 0) + else if (strcmp(tok1, "static") == 0 && strstr(buf + 6, "_bits")) { if (!IMAGE_DIMENSIONS_OK(im->w, im->h)) goto quit; @@ -155,7 +166,7 @@ load2(ImlibImage * im, int load_data) } else { - goto quit; + continue; } } else --
