[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=06b072e

The following commit has been merged in the master branch:
commit 06b072e39b1254363664a720d7591d6a814091e4
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Apr 22 15:13:13 2016 +0000

    #1108.  Correction to r4285.  Code simplication.
---
 src/tiffimage.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 34c5c04..2f2b063 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -523,15 +523,14 @@ namespace Exiv2 {
                                 : 1
                                 ;
 
-                // if ( offset > io.size() ) offset = 0;  // Denial of service?
+                // if ( offset > io.size() ) offset = 0; // Denial of service?
                 DataBuf  buf(MIN(size*kount + pad,48));  // allocate a buffer
-                if ( (isStringType(type) && count*size > 4) || count*size > 4 ) { // read into buffer
+                std::memcpy(buf.pData_,dir.pData_+8,4);  // copy dir[8:11] into buffer (short strings)
+                if ( count*size > 4 ) {            // read into buffer
                     size_t   restore = io.tell();  // save
                     io.seek(offset,BasicIo::beg);  // position
                     io.read(buf.pData_,kount*size);// read
                     io.seek(restore,BasicIo::beg); // restore
-                } else {                     // move data from directory into buffer
-                    std::memcpy(buf.pData_,dir.pData_+8,4);
                 }
 
                 uint32_t Offset = isLongType(type) ? byteSwap4(buf,0,bSwap) : 0 ;

-- 
exiv2 packaging