diff options
| author | Leon Scroggins III <scroggo@google.com> | 2018-03-12 14:49:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-12 14:49:05 +0000 |
| commit | 49b79bc8ec66538027e018ed655b27af5b77a39e (patch) | |
| tree | ad1dbaac28851868cadbbdde7bceda97bc771a32 | |
| parent | 0aa61f9e866945145bf3dc21c1255190dedb78ef (diff) | |
| parent | 945ea16b97d3d2ee129a2b268f3efdf9c4307c81 (diff) | |
| download | piex-49b79bc8ec66538027e018ed655b27af5b77a39e.tar.gz | |
Fix an uninitialized memory read in PIEX am: bb217acdcaandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
am: 945ea16b97
Change-Id: Idba4f663af887b1b10138436e84dda340f83cbd7
| -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); |