voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-11 14:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix png signature check

Browse source
This commit is contained in:
MihailRis 2024-12-04 13:59:29 +03:00
parent 6f80369de5
commit c9fdc04b8f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/coders/png.cpp
View file

@ -13,7 +13,7 @@
static debug::Logger logger("png-coder"); static debug::Logger logger("png-coder");
// returns 0 if all-right, 1 otherwise // returns 0 if all-right, 1 otherwise
int _png_write( static int png_write(
const char* filename, uint width, uint height, const ubyte* data, bool alpha const char* filename, uint width, uint height, const ubyte* data, bool alpha
) { ) {
uint pixsize = alpha ? 4 : 3; uint pixsize = alpha ? 4 : 3;
@ -112,7 +112,7 @@ static void read_in_memory(png_structp pngPtr, png_bytep dst, png_size_t toread)
} }
std::unique_ptr<ImageData> png::load_image(const ubyte* bytes, size_t size) { std::unique_ptr<ImageData> png::load_image(const ubyte* bytes, size_t size) {
if (!png_check_sig(bytes, size)) { if (size < 8 || !png_check_sig(bytes, 8)) {
throw std::runtime_error("invalid png signature"); throw std::runtime_error("invalid png signature");
} }
png_structp pngPtr = nullptr; png_structp pngPtr = nullptr;
@ -223,7 +223,7 @@ std::unique_ptr<Texture> png::load_texture(const std::string& filename) {
} }
void png::write_image(const std::string& filename, const ImageData* image) { void png::write_image(const std::string& filename, const ImageData* image) {
_png_write( png_write(
filename.c_str(), filename.c_str(),
image->getWidth(), image->getWidth(),
image->getHeight(), image->getHeight(),