[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=8f5a084

The following commit has been merged in the master branch:
commit 8f5a084ec73dc9e93ea7825e0745c263ed5c1247
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jun 14 13:41:48 2008 +0000

    #558: Skip remainder of SOF segment (mhx).
---
 src/jpgimage.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 73a8bf3..fa429ce 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -405,11 +405,16 @@ namespace Exiv2 {
                          || marker == sof7_  || marker == sof9_  || marker == sof10_
                          || marker == sof11_ || marker == sof13_ || marker == sof14_
                          || marker == sof15_)) {
-                // we hit a SOFn (start-of-frame) marker
-                if (size < 8) throw Error(15);
+                // We hit a SOFn (start-of-frame) marker
+                if (size < 8) {
+                    rc = 7;
+                    break;
+                }
                 pixelHeight_ = getUShort(buf.pData_ + 3, bigEndian);
                 pixelWidth_ = getUShort(buf.pData_ + 5, bigEndian);
                 if (pixelHeight_ != 0) --search;
+                // Skip the remainder of the segment
+                io_->seek(size-bufRead, BasicIo::cur);
             }
             else {
                 if (size < 2) {

-- 
exiv2 packaging