Hello community, here is the log from the commit of package libraw for openSUSE:Factory checked in at 2015-06-17 16:15:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libraw (Old) and /work/SRC/openSUSE:Factory/.libraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libraw" Changes: -------- --- /work/SRC/openSUSE:Factory/libraw/libraw.changes 2015-05-15 09:55:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libraw.new/libraw.changes 2015-06-17 16:15:51.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jun 6 19:09:45 UTC 2015 - jeng...@inai.de + +- Update to new upstream release 0.16.2 +* Fixed several bugs detected by running American Fuzzy Lop. + +------------------------------------------------------------------- Old: ---- LibRaw-0.16.1.tar.gz New: ---- LibRaw-0.16.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw.spec ++++++ --- /var/tmp/diff_new_pack.5PEkod/_old 2015-06-17 16:15:52.000000000 +0200 +++ /var/tmp/diff_new_pack.5PEkod/_new 2015-06-17 16:15:52.000000000 +0200 @@ -19,17 +19,16 @@ %define tar_name LibRaw Name: libraw -%define lnum 10 -Version: 0.16.1 +%define lname libraw10 +Version: 0.16.2 Release: 0 Summary: Library for reading RAW files obtained from digital photo cameras License: CDDL-1.0 or LGPL-2.1 Group: Development/Libraries/C and C++ Url: http://www.libraw.org/ -#Freecode-URL: http://freecode.com/projects/libraw #Git-Clone: git://github.com/LibRaw/LibRaw -Source: http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz +Source: http://www.libraw.org/data/%tar_name-%version.tar.gz BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjasper-devel @@ -47,7 +46,7 @@ %package tools Summary: Library for reading RAW files obtained from digital photo cameras -- Tools -Group: System/Libraries +Group: Productivity/Graphics/Other %description tools LibRaw is a library for reading RAW files obtained from digital photo @@ -56,11 +55,11 @@ LibRaw is based on the source codes of the dcraw utility, where part of drawbacks have already been eliminated and part will be fixed in future. -%package -n libraw%{lnum} +%package -n %lname Summary: Library for reading RAW files obtained from digital photo cameras Group: System/Libraries -%description -n libraw%{lnum} +%description -n %lname LibRaw is a library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others). @@ -68,9 +67,9 @@ drawbacks have already been eliminated and part will be fixed in future. %package devel -Summary: Development files for %{name} +Summary: Development files for libraw Group: Development/Libraries/C and C++ -Requires: libraw%{lnum} = %{version} +Requires: %lname = %version %description devel LibRaw is a library for reading RAW files obtained from digital photo @@ -82,7 +81,7 @@ %package devel-static Summary: Library for reading RAW files obtained from digital photo cameras Group: Development/Libraries/C and C++ -Requires: %{name}-devel = %{version} +Requires: %name-devel = %version %description devel-static LibRaw is a library for reading RAW files obtained from digital photo @@ -95,10 +94,10 @@ against LibRaw. LibRaw does not provide dynamic libraries. %prep -%setup -q -n %{tar_name}-%{version} +%setup -qn %tar_name-%version %build -CXXFLAGS="%{optflags} -fPIC" \ +export CXXFLAGS="%optflags -fPIC" %configure # build env is too broken for parallel build make %{?_smp_mflags} @@ -112,44 +111,33 @@ make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la # duplicated files -rm -rf %{buildroot}%{_datadir}/doc +rm -rf %buildroot%_datadir/doc %fdupes %buildroot/%_prefix -%post -n libraw%{lnum} -p /sbin/ldconfig - -%postun -n libraw%{lnum} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files tools -%defattr(-,root,root,-) -%{_bindir}/4channels -%{_bindir}/dcraw_emu -%{_bindir}/dcraw_half -%{_bindir}/half_mt -%{_bindir}/mem_image -%{_bindir}/raw-identify -%{_bindir}/simple_dcraw -%{_bindir}/unprocessed_raw -%{_bindir}/multirender_test -%{_bindir}/postprocessing_benchmark +%defattr(-,root,root) +%_bindir/* %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %doc Changelog.txt COPYRIGHT LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf %doc manual -%{_includedir}/%{name}/ -%{_libdir}/pkgconfig/libraw.pc -%{_libdir}/pkgconfig/libraw_r.pc -%{_libdir}/libraw.so -%{_libdir}/libraw_r.so - -%files -n libraw%{lnum} -%defattr(-,root,root,-) -%{_libdir}/libraw.so.%{lnum}* -%{_libdir}/libraw_r.so.%{lnum}* +%_includedir/%name/ +%_libdir/pkgconfig/*.pc +%_libdir/libraw.so +%_libdir/libraw_r.so + +%files -n %lname +%defattr(-,root,root) +%_libdir/libraw.so.* +%_libdir/libraw_r.so.* %files devel-static -%defattr(-,root,root,-) -%{_libdir}/libraw.a -%{_libdir}/libraw_r.a +%defattr(-,root,root) +%_libdir/libraw.a +%_libdir/libraw_r.a %changelog ++++++ LibRaw-0.16.1.tar.gz -> LibRaw-0.16.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/Changelog.txt new/LibRaw-0.16.2/Changelog.txt --- old/LibRaw-0.16.1/Changelog.txt 2015-05-11 10:52:20.000000000 +0200 +++ new/LibRaw-0.16.2/Changelog.txt 2015-05-16 14:32:15.000000000 +0200 @@ -1,3 +1,7 @@ +2015-05-16 Alex Tutubalin <l...@lexa.ru> + * Fix for several problems reported by AFL run + * LibRaw 0.16.2-Release + 2015-05-11 Alex Tutubalin <l...@lexa.ru> * Fix for dcraw ljpeg_start() vulnerability * LibRaw 0.16.1-Release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/autom4te.cache/output.0 new/LibRaw-0.16.2/autom4te.cache/output.0 --- old/LibRaw-0.16.1/autom4te.cache/output.0 2015-05-11 10:55:55.000000000 +0200 +++ new/LibRaw-0.16.2/autom4te.cache/output.0 2015-05-16 19:23:43.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.16.1. +@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.16.2. @%:@ @%:@ Report bugs to <i...@libraw.org>. @%:@ @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.16.1' -PACKAGE_STRING='LibRaw 0.16.1' +PACKAGE_VERSION='0.16.2' +PACKAGE_STRING='LibRaw 0.16.2' PACKAGE_BUGREPORT='i...@libraw.org' PACKAGE_URL='http://www.libraw.org' @@ -1349,7 +1349,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LibRaw 0.16.1 to adapt to many kinds of systems. +\`configure' configures LibRaw 0.16.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1419,7 +1419,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.16.1:";; + short | recursive ) echo "Configuration of LibRaw 0.16.2:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibRaw configure 0.16.1 +LibRaw configure 0.16.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2035,7 +2035,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.16.1, which was +It was created by LibRaw $as_me 0.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2898,7 +2898,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.16.1' + VERSION='0.16.2' # Some tools Automake needs. @@ -16362,7 +16362,7 @@ LIBRAW_SHLIB_VERSION=10:0:0 -LIBRAW_RELEASE_VERSION=0.16.1 +LIBRAW_RELEASE_VERSION=0.16.2 cat >confcache <<\_ACEOF @@ -16939,7 +16939,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.16.1, which was +This file was extended by LibRaw $as_me 0.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16997,7 +16997,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibRaw config.status 0.16.1 +LibRaw config.status 0.16.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/autom4te.cache/output.1 new/LibRaw-0.16.2/autom4te.cache/output.1 --- old/LibRaw-0.16.1/autom4te.cache/output.1 2015-05-11 10:56:00.000000000 +0200 +++ new/LibRaw-0.16.2/autom4te.cache/output.1 2015-05-16 19:23:48.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.16.1. +@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.16.2. @%:@ @%:@ Report bugs to <i...@libraw.org>. @%:@ @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.16.1' -PACKAGE_STRING='LibRaw 0.16.1' +PACKAGE_VERSION='0.16.2' +PACKAGE_STRING='LibRaw 0.16.2' PACKAGE_BUGREPORT='i...@libraw.org' PACKAGE_URL='http://www.libraw.org' @@ -1349,7 +1349,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LibRaw 0.16.1 to adapt to many kinds of systems. +\`configure' configures LibRaw 0.16.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1419,7 +1419,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.16.1:";; + short | recursive ) echo "Configuration of LibRaw 0.16.2:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibRaw configure 0.16.1 +LibRaw configure 0.16.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2035,7 +2035,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.16.1, which was +It was created by LibRaw $as_me 0.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2898,7 +2898,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.16.1' + VERSION='0.16.2' # Some tools Automake needs. @@ -16362,7 +16362,7 @@ LIBRAW_SHLIB_VERSION=10:0:0 -LIBRAW_RELEASE_VERSION=0.16.1 +LIBRAW_RELEASE_VERSION=0.16.2 cat >confcache <<\_ACEOF @@ -16939,7 +16939,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.16.1, which was +This file was extended by LibRaw $as_me 0.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16997,7 +16997,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibRaw config.status 0.16.1 +LibRaw config.status 0.16.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/autom4te.cache/output.2 new/LibRaw-0.16.2/autom4te.cache/output.2 --- old/LibRaw-0.16.1/autom4te.cache/output.2 2015-05-11 10:55:59.000000000 +0200 +++ new/LibRaw-0.16.2/autom4te.cache/output.2 2015-05-16 19:23:46.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.16.1. +@%:@ Generated by GNU Autoconf 2.69 for LibRaw 0.16.2. @%:@ @%:@ Report bugs to <i...@libraw.org>. @%:@ @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.16.1' -PACKAGE_STRING='LibRaw 0.16.1' +PACKAGE_VERSION='0.16.2' +PACKAGE_STRING='LibRaw 0.16.2' PACKAGE_BUGREPORT='i...@libraw.org' PACKAGE_URL='http://www.libraw.org' @@ -1349,7 +1349,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LibRaw 0.16.1 to adapt to many kinds of systems. +\`configure' configures LibRaw 0.16.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1419,7 +1419,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.16.1:";; + short | recursive ) echo "Configuration of LibRaw 0.16.2:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibRaw configure 0.16.1 +LibRaw configure 0.16.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2035,7 +2035,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.16.1, which was +It was created by LibRaw $as_me 0.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2898,7 +2898,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.16.1' + VERSION='0.16.2' # Some tools Automake needs. @@ -16362,7 +16362,7 @@ LIBRAW_SHLIB_VERSION=10:0:0 -LIBRAW_RELEASE_VERSION=0.16.1 +LIBRAW_RELEASE_VERSION=0.16.2 cat >confcache <<\_ACEOF @@ -16939,7 +16939,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.16.1, which was +This file was extended by LibRaw $as_me 0.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16997,7 +16997,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibRaw config.status 0.16.1 +LibRaw config.status 0.16.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/autom4te.cache/traces.1 new/LibRaw-0.16.2/autom4te.cache/traces.1 --- old/LibRaw-0.16.1/autom4te.cache/traces.1 2015-05-11 10:56:00.000000000 +0200 +++ new/LibRaw-0.16.2/autom4te.cache/traces.1 2015-05-16 19:23:48.000000000 +0200 @@ -4,7 +4,7 @@ m4trace:aclocal.m4:1441: -1- m4_include([m4/ltsugar.m4]) m4trace:aclocal.m4:1442: -1- m4_include([m4/ltversion.m4]) m4trace:aclocal.m4:1443: -1- m4_include([m4/lt~obsolete.m4]) -m4trace:configure.ac:2: -1- AC_INIT([LibRaw], [0.16.1], [i...@libraw.org], [], [http://www.libraw.org]) +m4trace:configure.ac:2: -1- AC_INIT([LibRaw], [0.16.2], [i...@libraw.org], [], [http://www.libraw.org]) m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) @@ -617,7 +617,7 @@ m4trace:configure.ac:225: -1- AC_SUBST([LIBRAW_SHLIB_VERSION], [10:0:0]) m4trace:configure.ac:225: -1- AC_SUBST_TRACE([LIBRAW_SHLIB_VERSION]) m4trace:configure.ac:225: -1- m4_pattern_allow([^LIBRAW_SHLIB_VERSION$]) -m4trace:configure.ac:226: -1- AC_SUBST([LIBRAW_RELEASE_VERSION], [0.16.1]) +m4trace:configure.ac:226: -1- AC_SUBST([LIBRAW_RELEASE_VERSION], [0.16.2]) m4trace:configure.ac:226: -1- AC_SUBST_TRACE([LIBRAW_RELEASE_VERSION]) m4trace:configure.ac:226: -1- m4_pattern_allow([^LIBRAW_RELEASE_VERSION$]) m4trace:configure.ac:228: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/configure new/LibRaw-0.16.2/configure --- old/LibRaw-0.16.1/configure 2015-05-11 10:56:00.000000000 +0200 +++ new/LibRaw-0.16.2/configure 2015-05-16 19:23:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for LibRaw 0.16.1. +# Generated by GNU Autoconf 2.69 for LibRaw 0.16.2. # # Report bugs to <i...@libraw.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.16.1' -PACKAGE_STRING='LibRaw 0.16.1' +PACKAGE_VERSION='0.16.2' +PACKAGE_STRING='LibRaw 0.16.2' PACKAGE_BUGREPORT='i...@libraw.org' PACKAGE_URL='http://www.libraw.org' @@ -1349,7 +1349,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LibRaw 0.16.1 to adapt to many kinds of systems. +\`configure' configures LibRaw 0.16.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1419,7 +1419,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.16.1:";; + short | recursive ) echo "Configuration of LibRaw 0.16.2:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibRaw configure 0.16.1 +LibRaw configure 0.16.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2035,7 +2035,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.16.1, which was +It was created by LibRaw $as_me 0.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2898,7 +2898,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.16.1' + VERSION='0.16.2' # Some tools Automake needs. @@ -16362,7 +16362,7 @@ LIBRAW_SHLIB_VERSION=10:0:0 -LIBRAW_RELEASE_VERSION=0.16.1 +LIBRAW_RELEASE_VERSION=0.16.2 cat >confcache <<\_ACEOF @@ -16939,7 +16939,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.16.1, which was +This file was extended by LibRaw $as_me 0.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16997,7 +16997,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibRaw config.status 0.16.1 +LibRaw config.status 0.16.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/internal/dcraw_common.cpp new/LibRaw-0.16.2/internal/dcraw_common.cpp --- old/LibRaw-0.16.1/internal/dcraw_common.cpp 2015-05-11 10:55:51.000000000 +0200 +++ new/LibRaw-0.16.2/internal/dcraw_common.cpp 2015-05-16 19:23:39.000000000 +0200 @@ -571,12 +571,15 @@ ushort len; uchar data[0x10000]; const uchar *dp; + int cnt = 0; memset (jh, 0, sizeof *jh); jh->restart = INT_MAX; fread (data, 2, 1, ifp); if (data[1] != 0xd8) return 0; do { + if(feof(ifp)) return 0; + if(cnt++ > 1024) return 0; fread (data, 2, 2, ifp); tag = data[0] << 8 | data[1]; len = (data[2] << 8 | data[3]) - 2; @@ -5503,16 +5506,6 @@ is_raw = 5; } break; -#ifdef LIBRAW_LIBRARY_BUILD - case 325: /* TileByteCount */ - tiff_ifd[ifd].tile_maxbytes = 0; - for(int jj=0;jj<len;jj++) - { - int s = get4(); - if(s > tiff_ifd[ifd].tile_maxbytes) tiff_ifd[ifd].tile_maxbytes=s; - } - break; -#endif case 330: /* SubIFDs */ if (!strcmp(model,"DSLR-A100") && tiff_ifd[ifd].t_width == 3872) { load_raw = &CLASS sony_arw_load_raw; @@ -5574,15 +5567,20 @@ break; case 33422: /* CFAPattern */ case 64777: /* Kodak P-series */ - if ((plen=len) > 16) plen = 16; - fread (cfa_pat, 1, plen, ifp); - for (colors=cfa=i=0; i < plen && colors < 4; i++) { - colors += !(cfa & (1 << cfa_pat[i])); - cfa |= 1 << cfa_pat[i]; - } - if (cfa == 070) memcpy (cfa_pc,"\003\004\005",3); /* CMY */ - if (cfa == 072) memcpy (cfa_pc,"\005\003\004\001",4); /* GMCY */ - goto guess_cfa_pc; + if(len > 0) + { + if ((plen=len) > 16) plen = 16; + fread (cfa_pat, 1, plen, ifp); + for (colors=cfa=i=0; i < plen && colors < 4; i++) { + colors += !(cfa & (1 << cfa_pat[i])); + cfa |= 1 << cfa_pat[i]; + } + if (cfa == 070) memcpy (cfa_pc,"\003\004\005",3); /* CMY */ + if (cfa == 072) memcpy (cfa_pc,"\005\003\004\001",4); /* GMCY */ + goto guess_cfa_pc; + } + else + break; case 33424: case 65024: fseek (ifp, get4()+base, SEEK_SET); @@ -5918,9 +5916,6 @@ tiff_samples = tiff_ifd[i].samples; tile_width = tiff_ifd[i].t_tile_width; tile_length = tiff_ifd[i].t_tile_length; -#ifdef LIBRAW_LIBRARY_BUILD - data_size = tile_length < INT_MAX && tile_length>0 ? tiff_ifd[i].tile_maxbytes: tiff_ifd[i].bytes; -#endif raw = i; } } @@ -8582,7 +8577,7 @@ filters = 0x16161616; } } else if (!strcmp(make,"Leica") || !strcmp(make,"Panasonic")) { - if ((flen - data_offset) / (raw_width*8/7) == raw_height) + if (raw_width > 0 && ((flen - data_offset) / (raw_width*8/7) == raw_height)) load_raw = &CLASS panasonic_load_raw; if (!load_raw) { load_raw = &CLASS unpacked_load_raw; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/internal/var_defines.h new/LibRaw-0.16.2/internal/var_defines.h --- old/LibRaw-0.16.1/internal/var_defines.h 2015-05-11 10:52:20.000000000 +0200 +++ new/LibRaw-0.16.2/internal/var_defines.h 2015-05-16 14:32:15.000000000 +0200 @@ -193,6 +193,7 @@ #ifdef LIBRAW_IO_REDEFINED #define fread(ptr,size,n,stream) stream->read(ptr,size,n) #define fseek(stream,o,w) stream->seek(o,w) +#define feof(stream) stream->eof() #define fseeko(stream,o,w) stream->seek(o,w) #define ftell(stream) stream->tell() #define ftello(stream) stream->tell() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.16.1/libraw/libraw_version.h new/LibRaw-0.16.2/libraw/libraw_version.h --- old/LibRaw-0.16.1/libraw/libraw_version.h 2015-05-11 10:52:20.000000000 +0200 +++ new/LibRaw-0.16.2/libraw/libraw_version.h 2015-05-16 14:32:15.000000000 +0200 @@ -25,7 +25,7 @@ #define LIBRAW_MAJOR_VERSION 0 #define LIBRAW_MINOR_VERSION 16 -#define LIBRAW_PATCH_VERSION 1 +#define LIBRAW_PATCH_VERSION 2 #define LIBRAW_VERSION_TAIL Release #define LIBRAW_SHLIB_CURRENT 10
