]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
ssh: fix string handling in unittest 1856/head
authorVictor Julien <victor@inliniac.net>
Tue, 16 Feb 2016 21:23:16 +0000 (22:23 +0100)
committerVictor Julien <victor@inliniac.net>
Tue, 16 Feb 2016 21:23:16 +0000 (22:23 +0100)
src/app-layer-ssh.c

index 879c77466557ca302f8ea16042cbbf67ce04047a..bbebcf6983471758fe970cdc6fb6bd2e6bdab9a9 100644 (file)
@@ -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;
     }