[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=1311ff7

The following commit has been merged in the master branch:
commit 1311ff7b1008639f1f6210ab2428fc0e23393675
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Apr 10 12:23:49 2006 +0000

    Fixed buffer overflow in ExifData::load() when called with an empty buffer; marked the function as deprecated, as it will eventually disappear.
---
 src/exif.cpp | 2 ++
 src/exif.hpp | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 808f4d3..5107604 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -465,6 +465,8 @@ namespace Exiv2 {
 
     int ExifData::load(const byte* buf, long len)
     {
+        if (!buf || len == 0) return -1;
+
         // Copy the data buffer
         delete[] pData_;
         pData_ = new byte[len];
diff --git a/src/exif.hpp b/src/exif.hpp
index 2386b05..ee1bf11 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -502,7 +502,8 @@ namespace Exiv2 {
         ExifData& operator=(const ExifData& rhs);
         /*!
           @brief Load the Exif data from a byte buffer. The data buffer
-                 must start with the TIFF header.
+                 must start with the TIFF header. This method is deprecated.
+                 Use ImageFactory::open() instead.
           @param buf Pointer to the data buffer to read from
           @param len Number of bytes in the data buffer
           @return 0 if successful.

-- 
exiv2 packaging