[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=4ab90e0

The following commit has been merged in the master branch:
commit 4ab90e0f60355b91e5de801a8eb29323a317ef5f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 6 15:44:59 2009 +0000

    #647: Extended range check.
---
 src/tiffvisitor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 07c7606..3c147b8 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -1315,7 +1315,9 @@ namespace Exiv2 {
         uint32_t size = typeSize * count;
         int32_t offset = getLong(p, byteOrder());
         byte* pData = p;
-        if (size > 4 && baseOffset() + offset >= size_) {
+        if (   size > 4
+            && (   baseOffset() + offset >= size_
+                || static_cast<int32_t>(baseOffset()) + offset < 0)) {
 #ifndef SUPPRESS_WARNINGS
                 std::cerr << "Error: Offset of "
                           << "directory " << tiffGroupName(object->group())

-- 
exiv2 packaging