提交 b8a0103d 编写于 作者: O Osier Yang

storage: Fix coverity warning

Introduced by commit e0139e30:

1777 	    /* Updating pool metadata */

(40) Event var_deref_op: Dereferencing null pointer "newvol".
     Also see events: [assign_zero]

1778 	    pool->def->allocation += newvol->allocation;
1779 	    pool->def->available -= newvol->allocation;
上级 c753749c
...@@ -1635,6 +1635,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, ...@@ -1635,6 +1635,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj,
virStorageBackendPtr backend; virStorageBackendPtr backend;
virStorageVolDefPtr origvol = NULL, newvol = NULL; virStorageVolDefPtr origvol = NULL, newvol = NULL;
virStorageVolPtr ret = NULL, volobj = NULL; virStorageVolPtr ret = NULL, volobj = NULL;
unsigned long long allocation;
int buildret; int buildret;
virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL);
...@@ -1758,6 +1759,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, ...@@ -1758,6 +1759,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj,
origvol->building = 0; origvol->building = 0;
newvol->building = 0; newvol->building = 0;
allocation = newvol->allocation;
newvol = NULL; newvol = NULL;
pool->asyncjobs--; pool->asyncjobs--;
...@@ -1775,8 +1777,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, ...@@ -1775,8 +1777,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj,
} }
/* Updating pool metadata */ /* Updating pool metadata */
pool->def->allocation += newvol->allocation; pool->def->allocation += allocation;
pool->def->available -= newvol->allocation; pool->def->available -= allocation;
VIR_INFO("Creating volume '%s' in storage pool '%s'", VIR_INFO("Creating volume '%s' in storage pool '%s'",
volobj->name, pool->def->name); volobj->name, pool->def->name);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册