[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=92a1626

The following commit has been merged in the master branch:
commit 92a162606cb0e20ffe060121248adb7e8986ffa7
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 6 11:07:12 2005 +0000

    Merged revisions 554:555 from branches/Exiv2-0_6_041212. Fixes bug #426 in trunk
---
 src/iptc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iptc.cpp b/src/iptc.cpp
index 3d34185..5572d36 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -139,7 +139,7 @@ namespace Exiv2 {
         uint32_t sizeData = 0;
         byte extTest = 0;
 
-        while (pRead < buf + len) {
+        while (pRead + 3 < buf + len) {
             if (*pRead++ != marker_) return 5;
             record = *pRead++;
             dataSet = *pRead++;

-- 
exiv2 packaging