ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-24 13:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed buffer overflow in JPG decoder (thanks, Thilo Schulz!)

Browse source
This commit is contained in:
Ryan C. Gordon 2005-09-07 18:29:03 +00:00
parent cb753845ae
commit 62678a0215
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/renderer/tr_image.c
View file

@ -1438,9 +1438,13 @@ static void LoadJPG( const char *filename, unsigned char **pic, int *width, int
* In this example, we need to make an output work buffer of the right size. * In this example, we need to make an output work buffer of the right size.
*/ */
/* JSAMPLEs per row in output buffer */ /* JSAMPLEs per row in output buffer */
row_stride = cinfo.output_width * cinfo.output_components;
out = ri.Malloc(cinfo.output_width*cinfo.output_height*cinfo.output_components); // This row_stride from libjpeg's example code doesn't work, since we
// want to fill in an alpha channel ourselves and jpegs might be 8-bit.
//row_stride = cinfo.output_width * cinfo.output_components;
row_stride = cinfo.output_width * 4;
out = ri.Malloc(row_stride*cinfo.output_height);
*pic = out; *pic = out;
*width = cinfo.output_width; *width = cinfo.output_width;