hyprwm/hyprgraphics
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprgraphics.git synced 2025-12-24 06:00:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

png: handle invalid buffer size returned by libspng
Some checks failed
Build & Test (Arch) / Arch: Build and Test (gcc) (push) Has been cancelled
Details
Build & Test (Arch) / Arch: Build and Test (clang) (push) Has been cancelled
Details
Build & Test / nix (hyprgraphics) (push) Has been cancelled
Details
Build & Test / nix (hyprgraphics-with-tests) (push) Has been cancelled
Details

Browse source 
sometimes (no clue why) spng_decoded_image_size is just plain wrong. In those cases, just guess what the size should be with 32bpp.

fixes #9
This commit is contained in:
Vaxry 2025-01-27 23:00:22 +00:00
parent 23783b9603
commit 12cd7034e4
3 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/image/formats/Png.cpp
View file

@ -31,16 +31,16 @@ std::expected<cairo_surface_t*, std::string> PNG::createSurfaceFromPNG(const std
spng_set_png_buffer(ctx, PNGCONTENT.data(), PNGCONTENT.size()); spng_set_png_buffer(ctx, PNGCONTENT.data(), PNGCONTENT.size());
spng_ihdr ihdr{0}; spng_ihdr ihdr{0};
if (spng_get_ihdr(ctx, &ihdr)) if (int ret = spng_get_ihdr(ctx, &ihdr); ret)
return std::unexpected("loading png: file content was empty (bad file?)"); return std::unexpected(std::string{"loading png: spng_get_ihdr failed: "} + spng_strerror(ret));
int fmt = SPNG_FMT_PNG; int fmt = SPNG_FMT_PNG;
if (ihdr.color_type == SPNG_COLOR_TYPE_INDEXED) if (ihdr.color_type == SPNG_COLOR_TYPE_INDEXED)
fmt = SPNG_FMT_RGB8; fmt = SPNG_FMT_RGB8;
size_t imageLength = 0; size_t imageLength = 0;
if (spng_decoded_image_size(ctx, fmt, &imageLength)) if (int ret = spng_decoded_image_size(ctx, fmt, &imageLength); ret)
return std::unexpected("loading png: spng_decoded_image_size failed"); return std::unexpected(std::string{"loading png: spng_decoded_image_size failed: "} + spng_strerror(ret));
uint8_t* imageData = (uint8_t*)malloc(imageLength); uint8_t* imageData = (uint8_t*)malloc(imageLength);
@ -48,9 +48,25 @@ std::expected<cairo_surface_t*, std::string> PNG::createSurfaceFromPNG(const std
return std::unexpected("loading png: mallocing failed, out of memory?"); return std::unexpected("loading png: mallocing failed, out of memory?");
// TODO: allow proper decode of high bitrate images // TODO: allow proper decode of high bitrate images
if (spng_decode_image(ctx, imageData, imageLength, SPNG_FMT_RGBA8, 0)) { bool succeededDecode = false;
int ret = spng_decode_image(ctx, imageData, imageLength, SPNG_FMT_RGBA8, 0);
if (!ret)
succeededDecode = true;
if (!succeededDecode && ret == SPNG_EBUFSIZ) {
// hack, but I don't know why decoded_image_size is sometimes wrong
imageLength = ihdr.height * ihdr.width * 4 /* FIXME: this is wrong if we doing >32bpp!!!! */;
imageData = (uint8_t*)realloc(imageData, imageLength);
ret = spng_decode_image(ctx, imageData, imageLength, SPNG_FMT_RGBA8, 0);
}
if (!ret)
succeededDecode = true;
if (!succeededDecode) {
free(imageData); free(imageData);
return std::unexpected("loading png: spng_decode_image failed (invalid image?)"); return std::unexpected(std::string{"loading png: spng_decode_image failed: "} + spng_strerror(ret) + " (bad image?)");
} }
// convert RGBA8888 -> ARGB8888 premult for cairo // convert RGBA8888 -> ARGB8888 premult for cairo