- markus@cvs.openbsd.org 2004/12/23 17:35:48

     [session.c]
     check for NULL; from mpech

2 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 82771c359..ed505169d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-20040118
+20050120
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2004/12/23 17:35:48
+     [session.c]
+     check for NULL; from mpech
+
+20050118
  - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement
    "make survey" and "make send-survey".  This will provide data on the
    configure parameters, platform and platform features to the development
@@ -1969,4 +1975,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3608 2005/01/18 01:45:42 dtucker Exp $
+$Id: ChangeLog,v 1.3609 2005/01/19 23:55:46 dtucker Exp $
diff --git a/session.c b/session.c
index 6844720d4..7f10abf7c 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.180 2004/07/28 09:40:29 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.181 2004/12/23 17:35:48 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -245,6 +245,10 @@ do_authenticated1(Authctxt *authctxt)
         u_int proto_len, data_len, dlen, compression_level = 0;
 
         s = session_new();
+        if (s == NULL) {
+                error("no more sessions");
+                return;
+        }
         s->authctxt = authctxt;
         s->pw = authctxt->pw;