diff --git a/pcsx2/GS/Renderers/HW/GSTextureReplacementLoaders.cpp b/pcsx2/GS/Renderers/HW/GSTextureReplacementLoaders.cpp index feb0bfee12..81e275d815 100644 --- a/pcsx2/GS/Renderers/HW/GSTextureReplacementLoaders.cpp +++ b/pcsx2/GS/Renderers/HW/GSTextureReplacementLoaders.cpp @@ -186,11 +186,15 @@ bool PNGLoader(GSTextureReplacements::File& file, const char* filename, GSTextur } const u32 pitch = width * sizeof(u32); + const u64 data_size = static_cast(pitch) * height; + if (data_size > UINT32_MAX) + return false; + tex->width = width; tex->height = height; tex->format = GSTexture::Format::Color; tex->pitch = pitch; - tex->data.resize(pitch * height); + tex->data.resize(static_cast(data_size)); const png_uint_32 row_bytes = png_get_rowbytes(png_ptr, info_ptr); std::vector row_data(row_bytes); @@ -553,15 +557,18 @@ static bool ParseDDSHeader(GSTextureReplacements::File& file, DDSLoadInfo* info) } info->base_image_pitch = header.dwPitchOrLinearSize; - info->base_image_size = info->base_image_pitch * blocks_high; } else { // Assume no padding between rows of blocks. info->base_image_pitch = blocks_wide * info->bytes_per_block; - info->base_image_size = info->base_image_pitch * blocks_high; } + const u64 base_image_size = static_cast(info->base_image_pitch) * blocks_high; + if (base_image_size > UINT32_MAX) + return false; + info->base_image_size = static_cast(base_image_size); + // Check for truncated or corrupted files. info->base_image_offset = sizeof(magic) + header_size; if (info->base_image_offset >= file.Size())