diff options
| author | Damien Miller <djm@mindrot.org> | 2008-11-03 19:16:57 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-11-03 19:16:57 +1100 |
| commit | c674d580dc9626ed3bb8886f34bd9dffef851a0a (patch) | |
| tree | 023d4daf1269057181dbc856ca445553ca81cb6c | |
| parent | c6aadd994d0ed79f5606b7061d576d514fd71cd7 (diff) | |
- markus@cvs.openbsd.org 2008/07/31 14:48:28
[sshconnect2.c]
don't allocate space for empty banners; report t8m at centrum.cz;
ok deraadt
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sshconnect2.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -11,6 +11,10 @@ [key.c] In random art visualization, make sure to use the end marker only at the end. Initial diff by Dirk Loss, tweaks and ok djm@ + - markus@cvs.openbsd.org 2008/07/31 14:48:28 + [sshconnect2.c] + don't allocate space for empty banners; report t8m at centrum.cz; + ok deraadt 20080906 - (dtucker) [config.guess config.sub] Update to latest versions from @@ -4745,4 +4749,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5101 2008/11/03 08:16:20 djm Exp $ +$Id: ChangeLog,v 1.5102 2008/11/03 08:17:08 djm Exp $ diff --git a/sshconnect2.c b/sshconnect2.c index 389bec9e..1a8f3907 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.166 2008/07/17 08:48:00 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.167 2008/07/31 14:48:28 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -383,7 +383,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt) debug3("input_userauth_banner"); raw = packet_get_string(&len); lang = packet_get_string(NULL); - if (options.log_level >= SYSLOG_LEVEL_INFO) { + if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; msg = xmalloc(len * 4); /* max expansion from strnvis() */ |