[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=110c487

The following commit has been merged in the master branch:
commit 110c487db448b85ede7b4e5146feb9e79b4ca3b9
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jun 28 15:47:36 2009 +0000

    533: Applied patch 5_recognize_small_corrupt_IRBs (Michael Ulbrich, Volker Grabsch)
---
 src/jpgimage.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index d20930f..fa5fd71 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -175,6 +175,13 @@ namespace Exiv2 {
 #ifdef DEBUG
         std::cerr << "pPsData doesn't start with '8BIM'
";
 #endif
+        if (position < sizePsData) {
+#ifndef SUPPRESS_WARNINGS
+            std::cerr << "Warning: "
+                      << "Invalid or extended Photoshop IRB
";
+#endif
+            return -2;
+        }
         return 3;
     } // Photoshop::locateIrb
 

-- 
exiv2 packaging