External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh-secret: Refactor error paths

Browse Source 
This patch switches string option retrieval to vshCommandOptStringReq
and refactors some error paths to avoid an unlikely memory leak of a
secret object in cmdSecretSetValue.
This commit is contained in:
Peter Krempa 2013-01-21 18:28:47 +01:00
parent 05af594bf7
commit fbe2d4940d
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/virsh-secret.c
View File

@ -48,7 +48,7 @@ vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name)
if (!vshCmdHasOption(ctl, cmd, optname)) if (!vshCmdHasOption(ctl, cmd, optname))
return NULL; return NULL;
if (vshCommandOptString(cmd, optname, &n) <= 0) if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0)
return NULL; return NULL;
vshDebug(ctl, VSH_ERR_DEBUG, vshDebug(ctl, VSH_ERR_DEBUG,
@ -90,28 +90,31 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd)
char *buffer; char *buffer;
virSecretPtr res; virSecretPtr res;
char uuid[VIR_UUID_STRING_BUFLEN]; char uuid[VIR_UUID_STRING_BUFLEN];
bool ret = false;
if (vshCommandOptString(cmd, "file", &from) <= 0) if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
return false; return false;
if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0)
return false; return false;
res = virSecretDefineXML(ctl->conn, buffer, 0); if (!(res = virSecretDefineXML(ctl->conn, buffer, 0))) {
VIR_FREE(buffer);
if (res == NULL) {
vshError(ctl, _("Failed to set attributes from %s"), from); vshError(ctl, _("Failed to set attributes from %s"), from);
return false; goto cleanup;
} }
if (virSecretGetUUIDString(res, &(uuid[0])) < 0) { if (virSecretGetUUIDString(res, &(uuid[0])) < 0) {
vshError(ctl, "%s", _("Failed to get UUID of created secret")); vshError(ctl, "%s", _("Failed to get UUID of created secret"));
virSecretFree(res); goto cleanup;
return false;
} }
vshPrint(ctl, _("Secret %s created\n"), uuid); vshPrint(ctl, _("Secret %s created\n"), uuid);
ret = true;
cleanup:
VIR_FREE(buffer);
virSecretFree(res); virSecretFree(res);
return true; return ret;
} }
/* /*
@ -188,11 +191,10 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
int res; int res;
bool ret = false; bool ret = false;
secret = vshCommandOptSecret(ctl, cmd, NULL); if (!(secret = vshCommandOptSecret(ctl, cmd, NULL)))
if (secret == NULL)
return false; return false;
if (vshCommandOptString(cmd, "base64", &base64) <= 0) if (vshCommandOptStringReq(ctl, cmd, "base64", &base64) < 0)
goto cleanup; goto cleanup;
if (!base64_decode_alloc(base64, strlen(base64), &value, &value_size)) { if (!base64_decode_alloc(base64, strlen(base64), &value, &value_size)) {
@ -201,7 +203,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
} }
if (value == NULL) { if (value == NULL) {
vshError(ctl, "%s", _("Failed to allocate memory")); vshError(ctl, "%s", _("Failed to allocate memory"));
return false; goto cleanup;
} }
res = virSecretSetValue(secret, (unsigned char *)value, value_size, 0); res = virSecretSetValue(secret, (unsigned char *)value, value_size, 0);