Hello community, here is the log from the commit of package libraw for openSUSE:Factory checked in at 2019-01-15 09:13:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libraw (Old) and /work/SRC/openSUSE:Factory/.libraw.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libraw" Tue Jan 15 09:13:12 2019 rev:52 rq:664333 version:0.19.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libraw/libraw.changes 2019-01-03 18:04:15.844266465 +0100 +++ /work/SRC/openSUSE:Factory/.libraw.new.28833/libraw.changes 2019-01-15 09:13:13.734410739 +0100 @@ -1,0 +2,12 @@ +Thu Jan 10 10:57:32 UTC 2019 - Petr Gajdos <[email protected]> + +- supplementary fix for https://github.com/LibRaw/LibRaw/issues/195 + + libraw-half-size-allocation-buffer-overflow.patch + +------------------------------------------------------------------- +Tue Jan 8 13:22:31 UTC 2019 - Petr Gajdos <[email protected]> + +- asan_build: build ASAN included +- debug_build: build more suitable for debugging + +------------------------------------------------------------------- New: ---- libraw-half-size-allocation-buffer-overflow.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw.spec ++++++ --- /var/tmp/diff_new_pack.SvG9RZ/_old 2019-01-15 09:13:14.294410221 +0100 +++ /var/tmp/diff_new_pack.SvG9RZ/_new 2019-01-15 09:13:14.298410217 +0100 @@ -1,7 +1,7 @@ # # spec file for package libraw # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,9 @@ # +%define debug_build 0 +%define asan_build 0 + %define tar_name LibRaw %define lver 19 %define lname libraw%{lver} @@ -29,6 +32,7 @@ #Git-Clone: git://github.com/LibRaw/LibRaw Source: https://www.libraw.org/data/%tar_name-%version.tar.gz Patch1: libraw-Add-Sony-ILCE-7M3.patch +Patch2: libraw-half-size-allocation-buffer-overflow.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -100,12 +104,21 @@ %prep %setup -q -n %{tar_name}-%{version} %patch1 -p1 +%patch2 -p1 %build -export CXXFLAGS="%optflags -fPIC -DUSE_ZLIB" +export CXXFLAGS="%{optflags} -fPIC -DUSE_ZLIB" +%if %{debug_build} +export CXXFLAGS="$CXXFLAGS -O0" +%endif export LIBS="$LIBS -lz" autoreconf -fi %configure +%if %{asan_build} +sed -i -e 's/\(^CXXFLAGS =.*\)/\1 -fsanitize=address/' \ + -e 's/\(^LIBS =.*\)/\1 -lasan/' \ + Makefile +%endif make %{?_smp_mflags} %install ++++++ libraw-half-size-allocation-buffer-overflow.patch ++++++ diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp index a0cd7226..6d1376f6 100644 --- a/internal/dcraw_common.cpp +++ b/internal/dcraw_common.cpp @@ -18997,10 +18997,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;
