GS: Fix OOB memory accesses when loading replacement textures

This commit is contained in:
chaoticgd authored and Ty committed 2026-11-01 01:04:03 -05:00
1 parent 8d2ad89181
commit da6bae1050
1 file changed
+10 -3
@@ -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<u64>(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<size_t>(data_size));
const png_uint_32 row_bytes = png_get_rowbytes(png_ptr, info_ptr);
std::vector<u8> 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<u64>(info->base_image_pitch) * blocks_high;
if (base_image_size > UINT32_MAX)
return false;
info->base_image_size = static_cast<u32>(base_image_size);
// Check for truncated or corrupted files.
info->base_image_offset = sizeof(magic) + header_size;
if (info->base_image_offset >= file.Size())