diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-04-18 11:22:27 +0000 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-04-18 11:22:27 +0000 |
commit | f402e8d113258d23e10cb2f31ed964bf535bd55a (patch) | |
tree | a88d2b261cf95590342b7f2be554d66b7537e096 /libssh/keys.c | |
parent | ff73826b45c7ea08d5cb8aa9478f822dc58c8c12 (diff) | |
download | libssh-f402e8d113258d23e10cb2f31ed964bf535bd55a.tar.gz libssh-f402e8d113258d23e10cb2f31ed964bf535bd55a.tar.xz libssh-f402e8d113258d23e10cb2f31ed964bf535bd55a.zip |
Add error checks to ssh_do_sign_with_agent() and fix a memleak.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@546 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/keys.c')
-rw-r--r-- | libssh/keys.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/libssh/keys.c b/libssh/keys.c index 633585a..34f4151 100644 --- a/libssh/keys.c +++ b/libssh/keys.c @@ -1133,14 +1133,29 @@ STRING *ssh_do_sign_with_agent(struct ssh_session *session, /* prepend session identifier */ session_id = string_new(SHA_DIGEST_LEN); + if (session_id == NULL) { + return NULL; + } string_fill(session_id, crypto->session_id, SHA_DIGEST_LEN); sigbuf = buffer_new(); + if (sigbuf == NULL) { + string_free(session_id); + return NULL; + } - buffer_add_ssh_string(sigbuf, session_id); + if (buffer_add_ssh_string(sigbuf, session_id) < 0) { + buffer_free(sigbuf); + string_free(session_id); + return NULL; + } + string_free(session_id); /* append out buffer */ - buffer_add_buffer(sigbuf, buf); + if (buffer_add_buffer(sigbuf, buf) < 0) { + buffer_free(sigbuf); + return NULL; + } /* create signature */ signature = agent_sign_data(session, sigbuf, publickey); |