LibRaw/CVE-2018-20365.patch
2020-09-16 12:24:00 +08:00

34 lines
917 B
Diff

From 561ec9a7fb5ec694104a22b7b6cd820bfa449784 Mon Sep 17 00:00:00 2001
From: Alex Tutubalin <lexa@lexa.ru>
Date: Thu, 10 Jan 2019 09:22:39 +0300
Subject: [PATCH] Sinar 4shot: zero filters for multi-shot images
---
internal/dcraw_common.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp
index 29cc72f..1ca70cf 100644
--- a/internal/dcraw_common.cpp
+++ b/internal/dcraw_common.cpp
@@ -18969,10 +18969,15 @@ void CLASS identify()
{
if (!load_raw)
load_raw = &CLASS unpacked_load_raw;
- if (is_raw > 1 && !shot_select && !half_size)
+ if (is_raw > 1 && !shot_select)
filters = 0;
maximum = 0x3fff;
}
+ else if(load_raw == &LibRaw::sinar_4shot_load_raw)
+ {
+ if (is_raw > 1 && !shot_select)
+ filters = 0;
+ }
else if (!strncmp(make, "Leaf", 4))
{
maximum = 0x3fff;
--
2.23.0