rpms/LibRaw
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix for double-free.

Browse Source
This commit is contained in:
Jon Ciesla 2013-05-31 05:40:22 -05:00
parent 2f71c35cb0
commit 6b98554738
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
LibRaw-0.14.8-errorhandling.patch Normal file
View File

@ -0,0 +1,49 @@
diff -U3 -r LibRaw-0.14.8.orig/Changelog.rus LibRaw-0.14.8/Changelog.rus
--- LibRaw-0.14.8.orig/Changelog.rus 2013-05-17 14:54:17.000000000 -0500
+++ LibRaw-0.14.8/Changelog.rus 2013-05-31 05:31:45.970607271 -0500
@@ -1,4 +1,8 @@
-2013-05-21 Alex Tutubalin <lexa@lexa.ru>
+2013-05-31 Alex Tutubalin <lexa@lexa.ru>
+ * Исправлена ошибка при обработке поврежденных полноцветных
+ файлов (sRAW, Foveon)
+
+2013-05-21 Alex Tutubalin <lexa@lexa.ru>
* Исправлена ошибка в коде функции sony_decrypt(), приводившая
к неверному чтению камерного баланса белого на камерах Sony
если LibRaw была собрана gcc 4.8
diff -U3 -r LibRaw-0.14.8.orig/Changelog.txt LibRaw-0.14.8/Changelog.txt
--- LibRaw-0.14.8.orig/Changelog.txt 2013-05-17 14:54:17.000000000 -0500
+++ LibRaw-0.14.8/Changelog.txt 2013-05-31 05:31:45.970607271 -0500
@@ -1,3 +1,7 @@
+2013-05-31 Alex Tutubalin <lexa@lexa.ru>
+ * Fixed double call to free() on broken legacy-layout images
+ (backport from 0.15.x)
+
2013-05-21 Alex Tutubalin <lexa@lexa.ru>
* Fixed undefined behaviour in sony_decrypt() function.
This bug causes incorrect camera WB read for Sony cameras.
diff -U3 -r LibRaw-0.14.8.orig/src/libraw_cxx.cpp LibRaw-0.14.8/src/libraw_cxx.cpp
--- LibRaw-0.14.8.orig/src/libraw_cxx.cpp 2013-05-17 14:54:17.000000000 -0500
+++ LibRaw-0.14.8/src/libraw_cxx.cpp 2013-05-31 05:31:51.402607149 -0500
@@ -796,8 +796,8 @@
S.iheight= S.height;
IO.shrink = 0;
// allocate image as temporary buffer, size
- imgdata.rawdata.raw_alloc = calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
- imgdata.image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
+ imgdata.rawdata.raw_alloc = 0;
+ imgdata.image = (ushort (*)[4]) calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
}
@@ -807,8 +807,8 @@
// recover saved
if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY)
{
- imgdata.image = 0;
- imgdata.rawdata.color_image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
+ imgdata.rawdata.raw_alloc = imgdata.rawdata.color_image = imgdata.image;
+ imgdata.image = 0;
}
// calculate channel maximum

7
LibRaw.spec
View File

@ -2,7 +2,7 @@
Summary: Library for reading RAW files obtained from digital photo cameras Summary: Library for reading RAW files obtained from digital photo cameras
Name: LibRaw Name: LibRaw
Version: 0.14.8 Version: 0.14.8
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: Development/Libraries Group: Development/Libraries
URL: http://www.libraw.org URL: http://www.libraw.org
@ -15,6 +15,7 @@ Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz
Source1: http://www.libraw.org/data/%{name}-demosaic-pack-GPL2-%{version}.tar.gz Source1: http://www.libraw.org/data/%{name}-demosaic-pack-GPL2-%{version}.tar.gz
Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz
#Patch0: LibRaw-0.14.7-segfault.patch #Patch0: LibRaw-0.14.7-segfault.patch
Patch1: LibRaw-0.14.8-errorhandling.patch
%description %description
LibRaw is a library for reading RAW files obtained from digital photo LibRaw is a library for reading RAW files obtained from digital photo
@ -44,6 +45,7 @@ LibRaw static development libraries.
%prep %prep
%setup -q -a1 -a2 %setup -q -a1 -a2
#%patch0 -p0 #%patch0 -p0
%patch1 -p1
%build %build
%configure --enable-examples=no --enable-jasper --enable-lcms \ %configure --enable-examples=no --enable-jasper --enable-lcms \
@ -82,6 +84,9 @@ make install DESTDIR=%{buildroot}
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Wed May 29 2013 Jon Ciesla <limburgher@gmail.com> - 0.14.8-2
- Patch for double free, CVE-2013-2126, BZ 968387.
* Wed May 29 2013 Jon Ciesla <limburgher@gmail.com> - 0.14.8-1 * Wed May 29 2013 Jon Ciesla <limburgher@gmail.com> - 0.14.8-1
- Latest upstream, fixes gcc 4.8 issues. - Latest upstream, fixes gcc 4.8 issues.