[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=02c4f8e

The following commit has been merged in the master branch:
commit 02c4f8ec37e122a76865cabe0fa629dc4c9175a5
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jun 14 20:53:14 2016 +0000

    #889.  Fix submitted.  Thanks to Alyssa for reporting this.  Apologies for taking so long to investigate.
---
 src/crwimage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 10b6360..5d231ef 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -414,6 +414,7 @@ namespace Exiv2 {
             size_   = getULong(pData + start + 2, byteOrder);
             offset_ = getULong(pData + start + 6, byteOrder);
         }
+        if ( size_ > size || offset_ > size ) throw Error(26); // #889
         if (dl == directoryData) {
             size_ = 8;
             offset_ = start + 2;

-- 
exiv2 packaging