[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=5720f14

The following commit has been merged in the master branch:
commit 5720f144380858a68695f486ddf516a9c2f496af
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu May 28 10:19:12 2009 +0000

    Fixed nasty illegal read.
---
 src/value.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/value.hpp b/src/value.hpp
index 47377e0..7e9dfe1 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -1478,7 +1478,9 @@ namespace Exiv2 {
     int ValueType<T>::read(const byte* buf, long len, ByteOrder byteOrder)
     {
         value_.clear();
-        for (long i = 0; i < len; i += TypeInfo::typeSize(typeId())) {
+        long ts = TypeInfo::typeSize(typeId());
+        if (len % ts != 0) len = (len / ts) * ts;
+        for (long i = 0; i < len; i += ts) {
             value_.push_back(getValue<T>(buf + i, byteOrder));
         }
         return 0;

-- 
exiv2 packaging