From: Jim Meyering <meyering@redhat.com>
Date: Wed, 2 Sep 2009 07:58:28 +0000 (+0200)
Subject: storage_conf.c: avoid overflow upon use of "z" or "Z" (zebi) suffix
X-Git-Tag: v0.7.1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cff257f584345ad6eee3c2d26672c3c314e06399;p=thirdparty%2Flibvirt.git

storage_conf.c: avoid overflow upon use of "z" or "Z" (zebi) suffix

* src/storage_conf.c (virStorageSize): Don't try to compute 1024^7,
since it's too large for a 64-bit type.
---

diff --git a/src/storage_conf.c b/src/storage_conf.c
index c4460691c7..110f0ad3d2 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -919,12 +919,6 @@ virStorageSize(virConnectPtr conn,
                 1024ull;
             break;
 
-        case 'z':
-        case 'Z':
-            mult = 1024ull * 1024ull * 1024ull * 1024ull * 1024ull *
-                1024ull * 1024ull;
-            break;
-
         default:
             virStorageReportError(conn, VIR_ERR_XML_ERROR,
                                   _("unknown size units '%s'"), unit);