[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=6d88d2b

The following commit has been merged in the master branch:
commit 6d88d2b78bca86c41f38431d9904ae8bda73ffa8
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Nov 2 02:50:46 2012 +0000

    Fix: #862 buffer overflow.  See bug report discussion item#19.
---
 src/matroskavideo.cpp  |  2 +-
 src/quicktimevideo.cpp | 10 +++++-----
 src/riffvideo.cpp      | 18 +++++++++---------
 test/video-test.sh     |  3 +++
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/matroskavideo.cpp b/src/matroskavideo.cpp
index 559aa4f..379ba2d 100644
--- a/src/matroskavideo.cpp
+++ b/src/matroskavideo.cpp
@@ -562,7 +562,7 @@ namespace Exiv2 {
             return;
         }
 
-        DataBuf buf2(bufMinSize);
+        DataBuf buf2(bufMinSize+1);
         std::memset(buf2.pData_, 0x0, buf2.size_);
 		long s = static_cast<long>(size) ;
         io_->read(buf2.pData_,s);
diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
index 7e92d14..039486f 100644
--- a/src/quicktimevideo.cpp
+++ b/src/quicktimevideo.cpp
@@ -650,7 +650,7 @@ namespace Exiv2 {
     void QuickTimeVideo::decodeBlock()
     {
         const long bufMinSize = 4;
-        DataBuf buf(bufMinSize);
+        DataBuf buf(bufMinSize+1);
         unsigned long size = 0;
         buf.pData_[4] = '

-- 
exiv2 packaging