diff options
| author | Z Stern <zalman@google.com> | 2020-05-14 17:57:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-14 17:57:11 +0000 |
| commit | a3a89a2c0a7944b08389a6d358b60ac195711805 (patch) | |
| tree | d2bd15857f5bff3e418772dffcfb6d6782663730 | |
| parent | 021f4f74994635d7739d637f206aca1949eadc0a (diff) | |
| parent | 234929445c4609f8329b1d683a8d9052237f6fcd (diff) | |
| download | dng_sdk-a3a89a2c0a7944b08389a6d358b60ac195711805.tar.gz | |
Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1 am: 17f4b85725 am: ab47f56729 am: 0d886a49d3 am: ecb2edbc9a am: dd40fd0c8c am: 234929445candroid-11.0.0_r16android11-d1-b-release
Change-Id: I9fce0a06ddd96baca01cf3a1094dd55d272c8f93
| -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. |