[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/1.1.0-5-g33bc735

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 33bc735f8aa46191190a7574e700018af6b7a27e
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Fri Apr 10 02:01:11 2009 +0300

    Fix integer overflow bug in 32-bit architectures. (Closes: #522834)

diff --git a/debian/changelog b/debian/changelog
index ecddd39..ddeefd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kaboom (1.1.1~pre1) UNRELEASED; urgency=low
 
   * Force showing kaboom at the upper left corner of the screen,
     so that it doesn't get outside of the screen when it grows bigger.
+  * Fix integer overflow bug in 32-bit architectures. (Closes: #522834)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Apr 2009 00:57:13 +0300
 
diff --git a/diroperations/diroperations.cpp b/diroperations/diroperations.cpp
index 2f1a087..b7abc03 100644
--- a/diroperations/diroperations.cpp
+++ b/diroperations/diroperations.cpp
@@ -61,8 +61,9 @@ quint64 freeDirSpace(const QString & dir)
       //error handling
       return -1;
     }
-    qDebug() << "freeDirSpace" << dir << info.f_bsize*info.f_bavail;
-    return info.f_bsize*info.f_bavail;
+    quint64 result = quint64(info.f_bsize)*quint64(info.f_bavail);
+    qDebug() << "freeDirSpace" << dir << result;
+    return result;
 
 }
 
@@ -75,8 +76,9 @@ quint64 totalPartitionSize(const QString & dir)
       //error handling
       return -1;
     }
-    qDebug() << "totalPartitionSize" << dir << info.f_bsize*info.f_blocks;
-    return info.f_frsize*info.f_blocks;
+    quint64 result = quint64(info.f_bsize)*quint64(info.f_blocks);
+    qDebug() << "totalPartitionSize" << dir << result;
+    return result;
 
 }
 

-- 
Kaboom - Debian KDE 3->4 migration tool