- 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

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 52149d216..5c7d25efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 389bec9e4..1a8f39071 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() */