- 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

diff --git a/ChangeLog b/ChangeLog
index 0d0308b839f4d489398c0d6fbe639d9c7bc91755..806c37cb2273b585550633f916b86fe083246059 100644 (file)
--- 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

diff --git a/sshconnect2.c b/sshconnect2.c
index 389bec9e43b47dcf9eb9e12f4ff3a692e3941fe1..1a8f39071f2b8ac0d1aa81affd0e641fe95e214f 100644 (file)
--- 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() */