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

The following commit has been merged in the master branch:
commit cff1efe122330771d5d792aebc25a4f1ec705abc
Author: Mahesh <maheshmhegade at gmail.com>
Date:   Sun Jul 20 15:45:33 2014 +0000

    Coverity scan fixes CID : 981999 (size overflow warning : typecasted) and 981993( divided by zeor warning : added check beore operation)
---
 src/jp2image.cpp | 2 +-
 src/value.hpp    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index c32e3e4..da2128a 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -317,7 +317,7 @@ namespace Exiv2
                            std::cout << "Exiv2::Jp2Image::readMetadata: Xmp data found
";
 #endif
 
-                            rawData.alloc(box.boxLength - (sizeof(box) + sizeof(uuid)));
+                            rawData.alloc(box.boxLength - (u_int32_t)(sizeof(box) + sizeof(uuid)));
                             bufRead = io_->read(rawData.pData_, rawData.size_);
                             if (io_->error()) throw Error(14);
                             if (bufRead != rawData.size_) throw Error(20);
diff --git a/src/value.hpp b/src/value.hpp
index 59a72f9..c3eb459 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -1550,7 +1550,8 @@ namespace Exiv2 {
     {
         value_.clear();
         long ts = TypeInfo::typeSize(typeId());
-        if (len % ts != 0) len = (len / ts) * ts;
+        if (ts != 0)
+            if (len % ts != 0) len = (len / ts) * ts;
         for (long i = 0; i < len; i += ts) {
             value_.push_back(getValue<T>(buf + i, byteOrder));
         }

-- 
exiv2 packaging