diff options
| author |   Jim Meyering <meyering@redhat.com> | 2008-12-02 15:59:14 +0000 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-12-02 15:59:14 +0000 |
| commit | fa4fc0321aa9d9b0e85c2c77c391846d73e5d567 (patch) | |
| tree | 465c433a6c90eeff6eab1c549182b119e539d1d0 /src | |
| parent | Older distributions (i.e. RHEL-5) don't have udevadm at all, but they do (diff) | |
| download | libvirt-fa4fc0321aa9d9b0e85c2c77c391846d73e5d567.tar.gz libvirt-fa4fc0321aa9d9b0e85c2c77c391846d73e5d567.tar.bz2 libvirt-fa4fc0321aa9d9b0e85c2c77c391846d73e5d567.zip | |
fix inadequate initialization in storage and test drivers
* src/storage_driver.c (storageListPools): Set all "names" entries to 0.
(storageListDefinedPools, storagePoolListVolumes): Likewise.
* src/test.c (testStoragePoolListVolumes): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/storage_driver.c | 8 | ||||
| -rw-r--r-- | src/test.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/storage_driver.c b/src/storage_driver.c index 366820b62..53388f1eb 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -347,7 +347,7 @@ storageListPools(virConnectPtr conn, free(names[i]); names[i] = NULL; } - memset(names, 0, nnames); + memset(names, 0, nnames * sizeof(*names)); return -1; } @@ -389,7 +389,7 @@ storageListDefinedPools(virConnectPtr conn, free(names[i]); names[i] = NULL; } - memset(names, 0, nnames); + memset(names, 0, nnames * sizeof(*names)); return -1; } @@ -880,7 +880,7 @@ storagePoolListVolumes(virStoragePoolPtr obj, return -1; } - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); for (i = 0 ; i < pool->volumes.count && n < maxnames ; i++) { if ((names[n++] = strdup(pool->volumes.objs[i]->name)) == NULL) { virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, @@ -895,7 +895,7 @@ storagePoolListVolumes(virStoragePoolPtr obj, for (n = 0 ; n < maxnames ; n++) VIR_FREE(names[i]); - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); return -1; } diff --git a/src/test.c b/src/test.c index 7998886c5..3e942daff 100644 --- a/src/test.c +++ b/src/test.c @@ -1951,7 +1951,7 @@ testStoragePoolListVolumes(virStoragePoolPtr obj, POOL_IS_ACTIVE(privpool, -1); int i = 0, n = 0; - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); for (i = 0 ; i < privpool->volumes.count && n < maxnames ; i++) { if ((names[n++] = strdup(privpool->volumes.objs[i]->name)) == NULL) { testError(obj->conn, VIR_ERR_NO_MEMORY, "%s", _("name")); @@ -1965,7 +1965,7 @@ testStoragePoolListVolumes(virStoragePoolPtr obj, for (n = 0 ; n < maxnames ; n++) VIR_FREE(names[i]); - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); return -1; } |