From: Victor Julien <victor@inliniac.net>
Date: Tue, 16 Feb 2016 21:23:16 +0000 (+0100)
Subject: ssh: fix string handling in unittest
X-Git-Tag: suricata-3.0.1RC1~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f3972850996873fed821bb53368d57f59ab3812;p=thirdparty%2Fsuricata.git

ssh: fix string handling in unittest
---

diff --git a/src/app-layer-ssh.c b/src/app-layer-ssh.c
index 879c774665..bbebcf6983 100644
--- a/src/app-layer-ssh.c
+++ b/src/app-layer-ssh.c
@@ -2109,13 +2109,13 @@ static int SSHParserTest19(void)
         goto end;
     }
 
-    char *name = SCMalloc(256);
+    char *name = SCCalloc(1, 256);
     if (name == NULL)
         goto end;
-    memset(name, 0x00, 256);
-    strlcpy(name, (char *)sshbuf3, strlen((char *)sshbuf3) - 1);
+    strlcpy(name, (char *)sshbuf3, 256);
+    name[strlen(name) - 1] = '\0'; // strip \r
 
-    if (strncmp((char*)ssh_state->srv_hdr.software_version, name, strlen(name)) != 0) {
+    if (strcmp((char*)ssh_state->srv_hdr.software_version, name) != 0) {
         printf("Client version string not parsed correctly: ");
         goto end;
     }