From: Victor Julien <victor@inliniac.net>
Date: Sun, 2 Mar 2014 10:57:13 +0000 (+0100)
Subject: ssh: fix scan-build warnings
X-Git-Tag: suricata-2.0rc2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F867%2Fhead;p=thirdparty%2Fsuricata.git

ssh: fix scan-build warnings

app-layer-ssh.c:165:5: warning: Value stored to 'input_len' is never read
    input_len -= 1;
    ^            ~
1 warning generated.

app-layer-ssh.c:160:5: warning: Value stored to 'input_len' is never read
    input_len -= 4;
    ^            ~
1 warning generated.
---

diff --git a/src/app-layer-ssh.c b/src/app-layer-ssh.c
index 5a11ebb295..5c1106d4ba 100644
--- a/src/app-layer-ssh.c
+++ b/src/app-layer-ssh.c
@@ -140,6 +140,9 @@ static int SSHParseRecordHeader(SshState *state, SshHeader *header,
 {
 #ifdef DEBUG
     BUG_ON(input_len != 6);
+#else
+    if (input_len < 6)
+        SCReturnInt(-1);
 #endif
     /* input and input_len now point past initial line */
     uint32_t pkt_len = 0;
@@ -157,12 +160,12 @@ static int SSHParseRecordHeader(SshState *state, SshHeader *header,
     SCLogDebug("pkt len: %"PRIu32, pkt_len);
 
     input += 4;
-    input_len -= 4;
+    //input_len -= 4;
 
     header->padding_len = *input;
 
     input += 1;
-    input_len -= 1;
+    //input_len -= 1;
 
     SCLogDebug("padding: %u", header->padding_len);