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

The following commit has been merged in the master branch:
commit fdd6c337db51f5e405fabf81397d1a2473735c90
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Aug 26 21:44:45 2014 +0000

    Issue# 983.  Thank You, Nehal for the patch.
---
 src/basicio.cpp  |  2 +-
 src/localtime.c  | 15 +++++++++++----
 src/tags_int.hpp |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index d2e42b6..d95940a 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -319,7 +319,7 @@ namespace Exiv2 {
             if (hKernel) {
                 GetFileInformationByHandle_t pfcn_GetFileInformationByHandle = (GetFileInformationByHandle_t)GetProcAddress(hKernel, "GetFileInformationByHandle");
                 if (pfcn_GetFileInformationByHandle) {
-                    BY_HANDLE_FILE_INFORMATION fi = {0};
+                    BY_HANDLE_FILE_INFORMATION fi;
                     if (pfcn_GetFileInformationByHandle(hFd, &fi)) {
                         nlink = fi.nNumberOfLinks;
                     }
diff --git a/src/localtime.c b/src/localtime.c
index 502ae9d..771e633 100644
--- a/src/localtime.c
+++ b/src/localtime.c
@@ -1119,11 +1119,18 @@ increment_overflow(number, delta)
 int *	number;
 int	delta;
 {
-	int	number0;
-
-	number0 = *number;
+	int i = *number;
+	/*
+        ** Copied from: https://www.ietf.org/timezones/code/localtime.c
+	** If i >= 0 there can only be overflow if i + delta > INT_MAX
+	** or if delta > INT_MAX - i; given i >= 0, INT_MAX - i cannot overflow.
+	** If i < 0 there can only be overflow if i + delta < INT_MIN
+	** or if delta < INT_MIN - i; given i < 0, INT_MIN - i cannot overflow.
+	*/
+	if ((i >= 0) ? (delta > INT_MAX - i) : (delta < INT_MIN - i))
+		return TRUE;
 	*number += delta;
-	return (*number < number0) != (delta < 0);
+	return FALSE;
 }
 
 static int
diff --git a/src/tags_int.hpp b/src/tags_int.hpp
index b98bbe1..9e8fb48 100644
--- a/src/tags_int.hpp
+++ b/src/tags_int.hpp
@@ -184,7 +184,7 @@ namespace Exiv2 {
              tag values to human readable labels.
      */
     struct TagDetails {
-        long val_;                              //!< Tag value
+        int64_t val_;                           //!< Tag value
         const char* label_;                     //!< Translation of the tag value
 
         //! Comparison operator for use with the find template

-- 
exiv2 packaging