[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=fc11d18

The following commit has been merged in the master branch:
commit fc11d180136a916f7f4f11a3db85567fb9b11717
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Dec 10 10:36:36 2005 +0000

    Make sure the str argument to sscanf() is a 0 terminated C-string. Fixes Bug #447.
---
 src/value.cpp               |  27 +++++++++++++++------------
 src/value.hpp               |  22 ++++++++++++++++++++--
 test/bugfixes-test.sh       |   4 ++++
 test/data/bugfixes-test.out |   4 ++++
 test/data/exiv2-bug447.jpg  | Bin 0 -> 10861 bytes
 5 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/value.cpp b/src/value.cpp
index 1a43c22..f38c3cd 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -41,6 +41,7 @@ EXIV2_RCSID("@(#) $Id$");
 #include <iomanip>
 #include <sstream>
 #include <cassert>
+#include <cstring>
 #include <ctime>
 
 // *****************************************************************************
@@ -393,9 +394,11 @@ namespace Exiv2 {
 #endif
             return 1;
         }
-        int scanned = sscanf(reinterpret_cast<const char*>(buf),
-                   "%4d%2d%2d",
-                   &date_.year, &date_.month, &date_.day);
+        // Make the buffer a 0 terminated C-string for sscanf
+        char b[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        memcpy(b, reinterpret_cast<const char*>(buf), 8);
+        int scanned = sscanf(b, "%4d%2d%2d",
+                             &date_.year, &date_.month, &date_.day);
         if (scanned != 3) {
 #ifndef SUPPRESS_WARNINGS
             std::cerr << Error(29) << "
";
@@ -414,9 +417,8 @@ namespace Exiv2 {
 #endif
             return 1;
         }
-        int scanned = sscanf(buf.data(),
-                   "%4d-%d-%d",
-                   &date_.year, &date_.month, &date_.day);
+        int scanned = sscanf(buf.c_str(), "%4d-%d-%d",
+                             &date_.year, &date_.month, &date_.day);
         if (scanned != 3) {
 #ifndef SUPPRESS_WARNINGS
             std::cerr << Error(29) << "
";
@@ -496,16 +498,17 @@ namespace Exiv2 {
 
     int TimeValue::read(const byte* buf, long len, ByteOrder /*byteOrder*/)
     {
+        // Make the buffer a 0 terminated C-string for scanTime[36]
+        char b[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        memcpy(b, reinterpret_cast<const char*>(buf), (len < 12 ? len : 11));
         // Hard coded to read HHMMSS or Iptc style times
         int rc = 1;
         if (len == 6) {
             // Try to read (non-standard) HHMMSS format
-            rc = scanTime3(reinterpret_cast<const char*>(buf),
-                           "%2d%2d%2d");
+            rc = scanTime3(b, "%2d%2d%2d");
         }
         if (len == 11) {
-            rc = scanTime6(reinterpret_cast<const char*>(buf),
-                           "%2d%2d%2d%1c%2d%2d");
+            rc = scanTime6(b, "%2d%2d%2d%1c%2d%2d");
         }
 #ifndef SUPPRESS_WARNINGS
         if (rc) {
@@ -521,10 +524,10 @@ namespace Exiv2 {
         int rc = 1;
         if (buf.length() < 9) {
             // Try to read (non-standard) H:M:S format
-            rc = scanTime3(buf.data(), "%d:%d:%d");
+            rc = scanTime3(buf.c_str(), "%d:%d:%d");
         }
         else {
-            rc = scanTime6(buf.data(), "%d:%d:%d%1c%d:%d");
+            rc = scanTime6(buf.c_str(), "%d:%d:%d%1c%d:%d");
         }
 #ifndef SUPPRESS_WARNINGS
         if (rc) {
diff --git a/src/value.hpp b/src/value.hpp
index fb94ee7..8060208 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -807,9 +807,27 @@ namespace Exiv2 {
     private:
         //! @name Manipulators
         //@{
-        //! Set time from \em buf if it conforms to \em format (3 input items)
+        /*!
+          @brief Set time from \em buf if it conforms to \em format 
+                 (3 input items).
+
+          This function only sets the hour, minute and second parts of time_.
+
+          @param buf    A 0 terminated C-string containing the time to parse.
+          @param format Format string for sscanf().
+          @return 0 if successful, else 1.
+         */
         int scanTime3(const char* buf, const char* format);
-        //! Set time from \em buf if it conforms to \em format (6 input items)
+        /*!
+          @brief Set time from \em buf if it conforms to \em format 
+                 (6 input items).
+
+          This function sets all parts of time_.
+
+          @param buf    A 0 terminated C-string containing the time to parse.
+          @param format Format string for sscanf().
+          @return 0 if successful, else 1.
+         */
         int scanTime6(const char* buf, const char* format);
         //@}
 
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index ac697e6..e5baecf 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -46,6 +46,10 @@ filename=`prep_file $num`
 $binpath/exiv2 -v -M'set Exif.Photo.UserComment A comment' $filename
 $binpath/exiv2 -pt $filename
 
+num=447 # Problem only visible in Valgrind
+filename=`prep_file $num`
+$binpath/exiv2 -pi $filename
+
 ) > $results 2>&1
 
 diff -q $diffargs $results $good
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 8d681a3..098173a 100644
--- a/test/data/bugfixes-test.out
+++ b/test/data/bugfixes-test.out
@@ -201,3 +201,7 @@ Exif.Thumbnail.YResolution                   Rational    1  180
 Exif.Thumbnail.ResolutionUnit                Short       1  inch
 Exif.Thumbnail.JPEGInterchangeFormat         Long        1  0
 Exif.Thumbnail.JPEGInterchangeFormatLength   Long        1  5448
+------> Bug 447 <-------
+Iptc.Application2.Caption                    String      0  
+Iptc.Application2.DateCreated                Date        8  2005-08-09
+Iptc.Application2.TimeCreated                Time       11  01:28:31-07:00
diff --git a/test/data/exiv2-bug447.jpg b/test/data/exiv2-bug447.jpg
new file mode 100644
index 0000000..0b8b61a
Binary files /dev/null and b/test/data/exiv2-bug447.jpg differ

-- 
exiv2 packaging