XPM loader: Accept signature not at the very start of the file

2019-11-09 14:09:37 +01:00 · 2019-11-09 14:09:37 +01:00 · 7a2769cad7
parent 484bd5cc79
commit 7a2769cad7
1 changed files with 5 additions and 4 deletions
--- a/src/modules/loaders/loader_xpm.c
+++ b/src/modules/loaders/loader_xpm.c
@ -125,13 +125,14 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
   if (!f)
      return 0;

-   if (fread(s, 1, 9, f) != 9)
+   if (fread(s, 1, sizeof(s) - 1, f) < 9)
+      goto quit;
+
+   s[sizeof(s) - 1] = '\0';
+   if (!strstr(s, " XPM */"))
      goto quit;

   rewind(f);
-   s[9] = 0;
-   if (strcmp("/* XPM */", s))
-      goto quit;

   i = 0;
   j = 0;