openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-23 13:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

mux.c: replace sshbuf_get_stringb with sshbuf_froms

Browse Source
This commit is contained in:
Markus Friedl
2012-10-10 23:16:31 +02:00
parent 472fc6a429
commit 185e7749a3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ssh/mux.c
View File

@@ -1013,7 +1013,7 @@ static int
mux_master_read_cb(Channel *c)
{
struct mux_master_state *state = (struct mux_master_state *)c->mux_ctx;
struct sshbuf *in, *out;
struct sshbuf *in = NULL, *out = NULL;
u_int type, rid, i;
int r, ret = -1;
@@ -1036,13 +1036,8 @@ mux_master_read_cb(Channel *c)
return 0;
}
if ((in = sshbuf_new()) == NULL)
fatal("%s: sshbuf_new failed", __func__);
if ((out = sshbuf_new()) == NULL)
fatal("%s: sshbuf_new failed", __func__);
/* Channel code ensures that we receive whole packets */
if ((r = sshbuf_get_stringb(c->input, in)) != 0) {
if ((r = sshbuf_froms(c->input, &in)) != 0) {
malf:
error("%s: malformed message: %s", __func__, ssh_err(r));
goto out;
@@ -1065,6 +1060,9 @@ mux_master_read_cb(Channel *c)
goto malf;
}
if ((out = sshbuf_new()) == NULL)
fatal("%s: sshbuf_new failed", __func__);
for (i = 0; mux_master_handlers[i].handler != NULL; i++) {
if (type == mux_master_handlers[i].type) {
ret = mux_master_handlers[i].handler(rid, c, in, out);