aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2012-10-05 11:17:06 +0200
committerAndreas Schneider <asn@cryptomilk.org>2012-10-05 11:48:34 +0200
commit5b32f31a315b03689e40c416dbea34c43b1530de (patch)
tree98fc9f674bc914c87f7357aea9fa33033c2878e3
parent3eac8e1c1865a16a2fb7b029b9ad8e4a77fac154 (diff)
downloadlibssh-5b32f31a315b03689e40c416dbea34c43b1530de.tar.gz
libssh-5b32f31a315b03689e40c416dbea34c43b1530de.tar.xz
libssh-5b32f31a315b03689e40c416dbea34c43b1530de.zip
channel: Fix a possible null pointer dereference.
(cherry picked from commit ceb8072b34a581eb72ed43f7f7ce78fd9b0ea708)
-rw-r--r--src/channels.c7
1 files changed, 6 insertions, 1 deletions
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){