validate png size with actual psm

ps2homebrew · Jan 22, 2020 · f5ab840 · f5ab840
1 parent ddb0d97
commit f5ab840
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/textures.c b/src/textures.c
@@ -457,12 +457,10 @@ int texPngLoad(GSTEXTURE *texture, const char *path, int texId, short psm)
     png_uint_32 pngWidth, pngHeight;
     int bitDepth, colorType, interlaceType;
     png_get_IHDR(pngPtr, infoPtr, &pngWidth, &pngHeight, &bitDepth, &colorType, &interlaceType, NULL, NULL);
-    if (texSizeValidate(pngWidth, pngHeight, psm) < 0)
-        return texPngEnd(pngPtr, infoPtr, file, ERR_BAD_DIMENSION);
     texUpdate(texture, pngWidth, pngHeight);
 
-    if (bitDepth < 4)
-        png_set_packing(pngPtr);
+    if (colorType == PNG_COLOR_TYPE_GRAY)
+        png_set_expand(pngPtr);
 
     if (bitDepth == 16)
         png_set_strip_16(pngPtr);
@@ -512,6 +510,15 @@ int texPngLoad(GSTEXTURE *texture, const char *path, int texId, short psm)
             return texPngEnd(pngPtr, infoPtr, file, ERR_BAD_DEPTH);
     }
 
+    if (texSizeValidate(texture->Width, texture->Height, texture->PSM) < 0) {
+        if (texture->Clut) {
+            free(texture->Clut);
+            texture->Clut = NULL;
+        }
+
+        return texPngEnd(pngPtr, infoPtr, file, ERR_BAD_DIMENSION);
+    }
+
     texPngReadData(texture, pngPtr, infoPtr, texPngReadPixels);
 
     return texPngEnd(pngPtr, infoPtr, file, 0);

diff --git a/src/themes.c b/src/themes.c
@@ -1232,7 +1232,7 @@ static void thmLoad(const char *themePath)
     for (i = L1_ICON; i <= R3_ICON; i++)
         thmLoadResource(&newT->textures[i], i, NULL, GS_PSM_CT32, 1); */
 
-	if (!themePath)
+    if (!themePath)
         for (i = ELF_FORMAT; i <= VMODE_PAL; i++)
             thmLoadResource(&newT->textures[i], i, NULL, GS_PSM_CT32, 1);