Skip to content

Commit

Permalink
Check image size when reading targa file
Browse files Browse the repository at this point in the history
Throw an error when image width or height is 0.

Fixes mozilla/mozjpeg#140, closes libjpeg-turbo#7.
  • Loading branch information
fbossen authored and dcommander committed Aug 14, 2015
1 parent 434ee9c commit d0bba12
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion rdtarga.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,8 @@ start_input_tga (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
if (cmaptype > 1 || /* cmaptype must be 0 or 1 */
source->pixel_size < 1 || source->pixel_size > 4 ||
(UCH(targaheader[16]) & 7) != 0 || /* bits/pixel must be multiple of 8 */
interlace_type != 0) /* currently don't allow interlaced image */
interlace_type != 0 || /* currently don't allow interlaced image */
width == 0 || height == 0) /* image width/height must be non-zero */
ERREXIT(cinfo, JERR_TGA_BADPARMS);

if (subtype > 8) {
Expand Down

0 comments on commit d0bba12

Please sign in to comment.