stb_image: fix for #76 POC h050. detect bad PSD file.

saitoha · Aug 5, 2018 · 197d025 · 197d025
1 parent d7b2600
commit 197d025
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/stb_image.h b/src/stb_image.h
@@ -5842,11 +5842,15 @@ static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req
             } else {
                stbi_uc *p = out+channel;
                if (bitdepth == 16) {  // input bpc
-                  for (i = 0; i < pixelCount; i++, p += 4)
+                  for (i = 0; i < pixelCount; i++, p += 4) {
+                     if (stbi__at_eof(s))   return stbi__errpuc("bad file","PSD file too short");
                      *p = (stbi_uc) (stbi__get16be(s) >> 8);
+                  }
                } else {
-                  for (i = 0; i < pixelCount; i++, p += 4)
+                  for (i = 0; i < pixelCount; i++, p += 4) {
+                     if (stbi__at_eof(s))   return stbi__errpuc("bad file","PSD file too short");
                      *p = stbi__get8(s);
+                  }
                }
             }
          }