[libvirt] [PATCH] virsh: don't call virSecretFree on NULL
Since the refactoring in fbe2d49 we call virSecretFree even if virSecretDefineXML fails, which leads to overwriting the error message with: error: Invalid secret: virSecretFree Bug: https://bugzilla.redhat.com/show_bug.cgi?id=929045 --- tools/virsh-secret.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index ea0b0c3..7201522 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -117,7 +117,8 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(buffer); - virSecretFree(res); + if (res) + virSecretFree(res); return ret; } -- 1.8.1.5
On 03/29/13 13:04, Ján Tomko wrote:
Since the refactoring in fbe2d49 we call virSecretFree even if virSecretDefineXML fails, which leads to overwriting the error message with: error: Invalid secret: virSecretFree
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=929045 --- tools/virsh-secret.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Ah, shame on me. ACK and 1.0.4-worth. Peter
On 03/29/2013 01:10 PM, Peter Krempa wrote:
On 03/29/13 13:04, Ján Tomko wrote:
Since the refactoring in fbe2d49 we call virSecretFree even if virSecretDefineXML fails, which leads to overwriting the error message with: error: Invalid secret: virSecretFree
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=929045 --- tools/virsh-secret.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Ah, shame on me. ACK and 1.0.4-worth.
Peter
Thanks, pushed now.
participants (2)
-
Ján Tomko -
Peter Krempa