[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=a558a1d

The following commit has been merged in the master branch:
commit a558a1d066a70e23f4bc96cca1c80ca58646eec8
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Nov 17 07:20:52 2011 +0000

    #797: Truncate entries with an out-of-bounds upper boundary, rather than trying to adjust their size.
---
 src/tiffvisitor.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index b89e0cd..0a9e6d6 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -1523,10 +1523,9 @@ namespace Exiv2 {
                           << ", exceeds buffer size by "
                           // cast to make MSVC happy
                           << static_cast<uint32_t>(pData + size - pLast_)
-                          << " Bytes; adjusting the size
";
+                          << " Bytes; truncating the entry
";
 #endif
-                size = static_cast<uint32_t>(pLast_ - pData);
-                // Todo: adjust count, make size a multiple of typeSize
+                size = 0;
             }
         }
         Value::AutoPtr v = Value::create(typeId);

-- 
exiv2 packaging