diff options
| author | Frank Bossen <frank@bossentech.com> | 2014-12-29 18:38:36 +0100 |
|---|---|---|
| committer | DRC <information@libjpeg-turbo.org> | 2015-08-14 11:42:23 -0500 |
| commit | 82923eb93a2eacf4a593e00e3e672bbb86a8a3a0 (patch) | |
| tree | 616194af2adde6937822981014f88090897d3ab1 | |
| parent | a3ef34c626dc50d41a0949d53dadaf65cd99e6c0 (diff) | |
| download | libjpeg-turbo-82923eb93a2eacf4a593e00e3e672bbb86a8a3a0.tar.gz | |
Check image size when reading targa file
Throw an error when image width or height is 0.
Fixes mozilla/mozjpeg#140, closes #7.
| -rw-r--r-- | rdtarga.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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) { |