lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-29 01:03:57 +03:00
Code Activity

agent: Use SSH_STRING_FREE()

Browse Source 
Fixes T183

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Andreas Schneider
2019-10-28 13:49:51 +01:00
parent 321b27b788
commit 45ee892327
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/agent.c
View File

@@ -425,7 +425,7 @@ ssh_key ssh_agent_get_next_ident(struct ssh_session_struct *session,
/* get the comment */ /* get the comment */
tmp = ssh_buffer_get_ssh_string(session->agent->ident); tmp = ssh_buffer_get_ssh_string(session->agent->ident);
if (tmp == NULL) { if (tmp == NULL) {
ssh_string_free(blob); SSH_STRING_FREE(blob);
return NULL; return NULL;
} }
@@ -433,12 +433,12 @@ ssh_key ssh_agent_get_next_ident(struct ssh_session_struct *session,
if (comment) { if (comment) {
*comment = ssh_string_to_char(tmp); *comment = ssh_string_to_char(tmp);
} else { } else {
ssh_string_free(blob); SSH_STRING_FREE(blob);
ssh_string_free(tmp); SSH_STRING_FREE(tmp);
return NULL; return NULL;
} }
ssh_string_free(tmp); SSH_STRING_FREE(tmp);
/* get key from blob */ /* get key from blob */
rc = ssh_pki_import_pubkey_blob(blob, &key); rc = ssh_pki_import_pubkey_blob(blob, &key);
@@ -446,7 +446,7 @@ ssh_key ssh_agent_get_next_ident(struct ssh_session_struct *session,
/* Try again as a cert. */ /* Try again as a cert. */
rc = ssh_pki_import_cert_blob(blob, &key); rc = ssh_pki_import_cert_blob(blob, &key);
} }
ssh_string_free(blob); SSH_STRING_FREE(blob);
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
return NULL; return NULL;
} }
@@ -519,7 +519,7 @@ ssh_string ssh_agent_sign_data(ssh_session session,
/* adds len + blob */ /* adds len + blob */
rc = ssh_buffer_add_ssh_string(request, key_blob); rc = ssh_buffer_add_ssh_string(request, key_blob);
ssh_string_free(key_blob); SSH_STRING_FREE(key_blob);
if (rc < 0) { if (rc < 0) {
ssh_buffer_free(request); ssh_buffer_free(request);
return NULL; return NULL;