[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=29ad206

The following commit has been merged in the master branch:
commit 29ad20683833a68305b1a0eccc8547b025262ba2
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Mar 2 21:43:17 2016 +0000

    #1164.  Fix submitted.  Thank you Nicolas and Gilles for reporting this.  More comments in the issue report.
---
 src/crwimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index cd626ed..bdb061d 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -448,7 +448,7 @@ namespace Exiv2 {
                                       ByteOrder   byteOrder)
     {
         uint32_t o = getULong(pData + size - 4, byteOrder);
-        if (o + 2 > size) throw Error(33);
+        if (size < 2 || o > size-2) throw Error(33);
         uint16_t count = getUShort(pData + o, byteOrder);
 #ifdef DEBUG
         std::cout << "Directory at offset " << std::dec << o

-- 
exiv2 packaging