diff options
| author | Damien Miller <djm@mindrot.org> | 2012-02-10 22:16:28 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2012-02-10 22:16:28 +0100 |
| commit | 2ec0342ed4f1fcf4d7b140f9d91bc97c8025221a (patch) | |
| tree | f92da16e93c9388f4f5777fc22bbd1349ff1f1d3 /mux.c | |
| parent | - djm@cvs.openbsd.org 2012/01/05 00:16:56 (diff) | |
| download | openssh-2ec0342ed4f1fcf4d7b140f9d91bc97c8025221a.tar.xz openssh-2ec0342ed4f1fcf4d7b140f9d91bc97c8025221a.zip | |
- djm@cvs.openbsd.org 2012/01/07 21:11:36
[mux.c]
fix double-free in new session handler
Diffstat (limited to 'mux.c')
| -rw-r--r-- | mux.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.33 2011/12/04 23:16:12 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.34 2012/01/07 21:11:36 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -341,10 +341,8 @@ process_mux_new_session(u_int rid, Channel *c, Buffer *m, Buffer *r) env_len = 0; while (buffer_len(m) > 0) { #define MUX_MAX_ENV_VARS 4096 - if ((cp = buffer_get_string_ret(m, &len)) == NULL) { - xfree(cmd); + if ((cp = buffer_get_string_ret(m, &len)) == NULL) goto malf; - } if (!env_permitted(cp)) { xfree(cp); continue; |