Targeted minimal fix for security issue in CVE-2020-9589. am: 8051967ac1
Change-Id: Ifa5bebb1e0a14dfed16958a0710a7232db9755ff
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.
