| commit | f422f0eaa53dce14554f9a08fa9538a1a50ea323 | [log] [tgz] |
|---|---|---|
| author | Z Stern <zalman@google.com> | Tue May 12 13:32:09 2020 -0700 |
| committer | Anis Assi <anisassi@google.com> | Thu May 14 09:51:15 2020 -0700 |
| tree | 4fb273149ca7e3908ddeda16180c5c221ff459e0 | |
| parent | d7ee3d248922786d522f0ffe51cefc70ad6b0f41 [diff] |
Targeted minimal fix for security issue in CVE-2020-9589. Bug: 156261521 Test: If0722deb96def186fcd0a2d97e57647a1b5987f8 Change-Id: I380c158e465a995a5b0f88021cbf10bbf050db00 Merged-In: I380c158e465a995a5b0f88021cbf10bbf050db00 (cherry picked from commit 8051967ac143c7e07ee636315cee8b56874e22c3)
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 @@ #if qSupportHasselblad_3FR - if (info.Ss == 8) + if (info.Ss == 8 && (numCOL & 1) == 0) { fHasselblad3FR = true; @@ -2412,7 +2412,7 @@ // 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.