openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virNetLibsshAuthenticatePrivkeyCb: Use g_autofree for 'actual_prompt' 

So that the 'error' label can be removed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-03-02 14:18:05 +01:00
parent 08372887ec
commit 1b50f2d102
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rpc/virnetlibsshsession.c
View File

@ -406,7 +406,7 @@ virNetLibsshAuthenticatePrivkeyCb(const char *prompt,
virNetLibsshSessionPtr sess = userdata; virNetLibsshSessionPtr sess = userdata;
virConnectCredential retr_passphrase; virConnectCredential retr_passphrase;
int cred_type; int cred_type;
char *actual_prompt = NULL; g_autofree char *actual_prompt = NULL;
int p; int p;
/* request user's key password */ /* request user's key password */
@ -421,7 +421,7 @@ virNetLibsshAuthenticatePrivkeyCb(const char *prompt,
if (cred_type == -1) { if (cred_type == -1) {
virReportError(VIR_ERR_LIBSSH, "%s", virReportError(VIR_ERR_LIBSSH, "%s",
_("no suitable callback for input of key passphrase")); _("no suitable callback for input of key passphrase"));
goto error; return -1;
} }
actual_prompt = g_strndup(prompt, virLengthForPromptString(prompt)); actual_prompt = g_strndup(prompt, virLengthForPromptString(prompt));
@ -434,7 +434,7 @@ virNetLibsshAuthenticatePrivkeyCb(const char *prompt,
virReportError(VIR_ERR_LIBSSH, "%s", virReportError(VIR_ERR_LIBSSH, "%s",
_("failed to retrieve private key passphrase: " _("failed to retrieve private key passphrase: "
"callback has failed")); "callback has failed"));
goto error; return -1;
} }
p = virStrncpy(buf, retr_passphrase.result, p = virStrncpy(buf, retr_passphrase.result,
@ -444,16 +444,10 @@ virNetLibsshAuthenticatePrivkeyCb(const char *prompt,
if (p < 0) { if (p < 0) {
virReportError(VIR_ERR_LIBSSH, "%s", virReportError(VIR_ERR_LIBSSH, "%s",
_("passphrase is too long for the buffer")); _("passphrase is too long for the buffer"));
goto error; return -1;
} }
VIR_FREE(actual_prompt);
return 0; return 0;
error:
VIR_FREE(actual_prompt);
return -1;
} }
static int static int