RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:27:46 +00:00
Code Issues Activity Actions

LibGfx: Teach all image decoders to fail on bitmap allocation failure

Browse source 
We don't need to wait for oss-fuzz to find this for us. :^)
This commit is contained in:
Andreas Kling 2020-12-20 16:04:29 +01:00
parent 71d92cef17
commit c7d0c2ee7a
7 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Libraries/LibGfx/JPGLoader.cpp
View file

@ -1126,9 +1126,11 @@ static void ycbcr_to_rgb(const JPGLoadingContext& context, Vector<Macroblock>& m
}
}
static void compose_bitmap(JPGLoadingContext& context, const Vector<Macroblock>& macroblocks)
static bool compose_bitmap(JPGLoadingContext& context, const Vector<Macroblock>& macroblocks)
{
context.bitmap = Bitmap::create_purgeable(BitmapFormat::RGB32, { context.frame.width, context.frame.height });
if (!context.bitmap)
return false;
for (u32 y = context.frame.height - 1; y < context.frame.height; y--) {
const u32 block_row = y / 8;
@ -1142,6 +1144,8 @@ static void compose_bitmap(JPGLoadingContext& context, const Vector<Macroblock>&
context.bitmap->set_pixel(x, y, color);
}
}
return true;
}
static bool parse_header(InputMemoryStream& stream, JPGLoadingContext& context)
@ -1288,7 +1292,8 @@ static bool decode_jpg(JPGLoadingContext& context)
dequantize(context, macroblocks);
inverse_dct(context, macroblocks);
ycbcr_to_rgb(context, macroblocks);
compose_bitmap(context, macroblocks);
if (!compose_bitmap(context, macroblocks))
return false;
return true;
}