Skip to content
Snippets Groups Projects
Commit af10eb83 authored by Matt Johnston's avatar Matt Johnston
Browse files

merge

--HG--
branch : coverity
parents 8e93ac99 098aba47
Branches
No related merge requests found
......@@ -186,7 +186,7 @@ static void ask_to_confirm(unsigned char* keyblob, unsigned int keybloblen,
char* fp = NULL;
FILE *tty = NULL;
char response = 'z';
int response = 'z';
fp = sign_key_fingerprint(keyblob, keybloblen);
if (cli_opts.always_accept_key) {
......
......@@ -361,9 +361,10 @@ static void cli_session_cleanup(void) {
/* Set std{in,out,err} back to non-blocking - busybox ash dies nastily if
* we don't revert the flags */
fcntl(cli_ses.stdincopy, F_SETFL, cli_ses.stdinflags);
fcntl(cli_ses.stdoutcopy, F_SETFL, cli_ses.stdoutflags);
fcntl(cli_ses.stderrcopy, F_SETFL, cli_ses.stderrflags);
/* Ignore return value since there's nothing we can do */
(void)fcntl(cli_ses.stdincopy, F_SETFL, cli_ses.stdinflags);
(void)fcntl(cli_ses.stdoutcopy, F_SETFL, cli_ses.stdoutflags);
(void)fcntl(cli_ses.stderrcopy, F_SETFL, cli_ses.stderrflags);
cli_tty_cleanup();
......
......@@ -138,7 +138,7 @@ static void svr_ensure_hostkey() {
break;
#endif
default:
(void)0;
dropbear_assert(0);
}
if (readhostkey(fn, svr_opts.hostkey, &type) == DROPBEAR_SUCCESS) {
......
......@@ -119,7 +119,7 @@ fail:
/* cleanup */
m_free(chansess->x11authprot);
m_free(chansess->x11authcookie);
close(fd);
m_close(fd);
return DROPBEAR_FAILURE;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment