diff options
| author | Z Stern <zalman@google.com> | 2020-05-14 16:58:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-14 16:58:13 +0000 |
| commit | 0d886a49d3d6a600f887815b1e9a3e9713d7bd0c (patch) | |
| tree | 4fb273149ca7e3908ddeda16180c5c221ff459e0 | |
| parent | f76714893c654b874433e635d6b799f7c50c5b0c (diff) | |
| parent | ab47f56729930f6fdaeb751ebe16c99093bfee6a (diff) | |
| download | dng_sdk-0d886a49d3d6a600f887815b1e9a3e9713d7bd0c.tar.gz | |
Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729
Change-Id: I2f7e5cb3225a4f6f475ab2217c04c95e4079b70e
| -rw-r--r-- | source/dng_lossless_jpeg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/dng_lossless_jpeg.cpp b/source/dng_lossless_jpeg.cpp index e3b0576..9d0d01a 100644 --- a/source/dng_lossless_jpeg.cpp +++ b/source/dng_lossless_jpeg.cpp @@ -2277,7 +2277,7 @@ void dng_lossless_decoder::DecodeImage () #if qSupportHasselblad_3FR - if (info.Ss == 8) + if (info.Ss == 8 && (numCOL & 1) == 0) { fHasselblad3FR = true; @@ -2412,7 +2412,7 @@ void dng_lossless_decoder::DecodeImage () // For the rest of the column on this row, predictor // calculations are based on PSV. - if (compsInScan == 2 && info.Ss == 1) + if (compsInScan == 2 && info.Ss == 1 && numCOL > 1) { // This is the combination used by both the Canon and Kodak raw formats. |