Evolution-x/external_piex
1
0
Fork 0
mirror of https://github.com/Evolution-X/external_piex synced 2026-01-30 08:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix an uninitialized memory read in PIEX

Browse Source 
Author: kjlubic@google.com

Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6293
This commit is contained in:
Leon Scroggins III
2018-03-09 16:23:15 -05:00
parent f7fc905cff
commit bb217acdca
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tiff_parser.cc
View File

@@ -165,11 +165,14 @@ bool FillPreviewImageData(const TiffDirectory& tiff_directory,
// Get color_space
if (tiff_directory.Has(kExifTagColorSpace)) {
std::uint32_t color_space;
success &= tiff_directory.Get(kExifTagColorSpace, &color_space);
if (color_space == 1) {
preview_image_data->color_space = PreviewImageData::kSrgb;
} else if (color_space == 65535 || color_space == 2) {
preview_image_data->color_space = PreviewImageData::kAdobeRgb;
if (tiff_directory.Get(kExifTagColorSpace, &color_space)) {
if (color_space == 1) {
preview_image_data->color_space = PreviewImageData::kSrgb;
} else if (color_space == 65535 || color_space == 2) {
preview_image_data->color_space = PreviewImageData::kAdobeRgb;
}
} else {
success = false;
}
}

2
src/tiff_parser.h
View File

@@ -163,7 +163,7 @@ bool GetFullDimension32(const tiff_directory::TiffDirectory& tiff_directory,
std::uint32_t* width, std::uint32_t* height);
// Reads the width and height of the crop information if available.
// Returns false if an error occured.
// Returns false if an error occurred.
bool GetFullCropDimension(const tiff_directory::TiffDirectory& tiff_directory,
std::uint32_t* width, std::uint32_t* height);