External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

storage: Need to also VIR_FREE(reg)

Browse Source 
Commit-id 'afc4631b' added the regfree(reg) to free resources alloc'd
during regcomp; however, reg still needed to be VIR_FREE()'d. The call
to regfree() also didn't account for possible NULL value.  Reformatted
the call to be closer to usage.
This commit is contained in:
John Ferlan 2013-01-10 14:44:26 -05:00 committed by Ján Tomko
parent 1bf661caf4
commit 71da3b66a8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/storage_backend_logical.c
View File

@ -208,13 +208,16 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool,
if (err != 0) { if (err != 0) {
char error[100]; char error[100];
regerror(err, reg, error, sizeof(error)); regerror(err, reg, error, sizeof(error));
regfree(reg);
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to compile regex %s"), _("Failed to compile regex %s"),
error); error);
goto cleanup; goto cleanup;
} }
if (regexec(reg, groups[3], nvars, vars, 0) != 0) { err = regexec(reg, groups[3], nvars, vars, 0);
regfree(reg);
if (err != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed volume extent devices value")); _("malformed volume extent devices value"));
goto cleanup; goto cleanup;
@ -264,7 +267,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool,
cleanup: cleanup:
VIR_FREE(regex); VIR_FREE(regex);
regfree(reg); VIR_FREE(reg);
VIR_FREE(vars); VIR_FREE(vars);
if (is_new_vol && (ret == -1)) if (is_new_vol && (ret == -1))
virStorageVolDefFree(vol); virStorageVolDefFree(vol);