diff options
| author | Leon Scroggins III <scroggo@google.com> | 2018-03-12 14:57:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-12 14:57:06 +0000 |
| commit | 4831a805127d04dfd5b996893aaa6cd181cc56f9 (patch) | |
| tree | ad1dbaac28851868cadbbdde7bceda97bc771a32 | |
| parent | 0aa61f9e866945145bf3dc21c1255190dedb78ef (diff) | |
| parent | 49b79bc8ec66538027e018ed655b27af5b77a39e (diff) | |
| download | piex-4831a805127d04dfd5b996893aaa6cd181cc56f9.tar.gz | |
Fix an uninitialized memory read in PIEX am: bb217acdca am: 945ea16b97
am: 49b79bc8ec
Change-Id: Ie3821020951d5978a311c6cee8f4bcc5a1f76984
| -rw-r--r-- | src/tiff_parser.cc | 13 | ||||
| -rw-r--r-- | src/tiff_parser.h | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/tiff_parser.cc b/src/tiff_parser.cc index 6bf3bb4..f36c5ba 100644 --- a/src/tiff_parser.cc +++ b/src/tiff_parser.cc @@ -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; } } diff --git a/src/tiff_parser.h b/src/tiff_parser.h index 84b3fc6..e809274 100644 --- a/src/tiff_parser.h +++ b/src/tiff_parser.h @@ -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); |