[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=781983a

The following commit has been merged in the master branch:
commit 781983a96a113e7dcb266b0a0fdfe9c3453e720a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Aug 1 15:49:41 2006 +0000

    Prevent overflow in addition. Fixes bug #482
---
 src/tiffvisitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index d189f08..60a3088 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -753,7 +753,7 @@ namespace Exiv2 {
                 return;
             }
             object->pData_ = pData_ + baseOffset() + object->offset();
-            if (object->pData() + object->size() > pLast_) {
+            if (object->size() > static_cast<uint32_t>(pLast_ - object->pData())) {
 #ifndef SUPPRESS_WARNINGS
                 std::cerr << "Warning: Upper boundary of data for "
                           << "directory " << object->groupName()

-- 
exiv2 packaging