summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-04-14 10:10:19 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-04-14 10:18:34 +0200
commit632cee44264c07cefbc4d15e96cf61a1b290395c (patch)
tree286ff99a8917d8a1a27dfd62fc8d7d620502c6dd
parentaf25fc35d14285c1422ba0a025de1a16ea9e3486 (diff)
downloadlibssh-632cee44264c07cefbc4d15e96cf61a1b290395c.tar.gz
libssh-632cee44264c07cefbc4d15e96cf61a1b290395c.tar.xz
libssh-632cee44264c07cefbc4d15e96cf61a1b290395c.zip
server: Fixed a possible NULL pointer dereference.
(cherry picked from commit 7e4916cefcc3a44557944e0f9573a9982d2a2ccd)
-rw-r--r--src/server.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c
index c86c2f4a..27319516 100644
--- a/src/server.c
+++ b/src/server.c
@@ -616,10 +616,13 @@ static int ssh_message_service_request_reply_default(ssh_message msg) {
int ssh_message_service_reply_success(ssh_message msg) {
struct ssh_string_struct *service;
- ssh_session session=msg->session;
+ ssh_session session;
+
if (msg == NULL) {
return SSH_ERROR;
}
+ session = msg->session;
+
ssh_log(session, SSH_LOG_PACKET,
"Sending a SERVICE_ACCEPT for service %s", msg->service_request.service);
if (buffer_add_u8(session->out_buffer, SSH2_MSG_SERVICE_ACCEPT) < 0) {