From 5b32f31a315b03689e40c416dbea34c43b1530de Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 5 Oct 2012 11:17:06 +0200
Subject: channel: Fix a possible null pointer dereference.

(cherry picked from commit ceb8072b34a581eb72ed43f7f7ce78fd9b0ea708)
---
 src/channels.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/channels.c b/src/channels.c
index 871e1401..221ce8e2 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -2277,11 +2277,16 @@ error:
  */
 int channel_read_buffer(ssh_channel channel, ssh_buffer buffer, uint32_t count,
     int is_stderr) {
-  ssh_session session=channel->session;
+  ssh_session session;
   char buffer_tmp[8192];
   int r;
   uint32_t total=0;
 
+  if (channel == NULL) {
+      return SSH_ERROR;
+  }
+  session = channel->session;
+
   enter_function();
   buffer_reinit(buffer);
   if(count==0){
-- 
cgit