ssh: wmem_strdup() never returns NULL
authorMartin Kaiser <wireshark@kaiser.cx>
Sun, 3 Jul 2016 14:04:19 +0000 (16:04 +0200)
committerMichael Mann <mmann78@netscape.net>
Sun, 3 Jul 2016 16:25:26 +0000 (16:25 +0000)
Change-Id: I2f7b01e5a71f043e49305d0e2a3e78eaa5eae0a8
Reviewed-on: https://code.wireshark.org/review/16262
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
epan/dissectors/packet-ssh.c

index 43cec6a233615c5f7d7f0a0908094f840dc92563..d8cd0b0f29300d0c9dd3f73fc4da86f26cab4435 100644 (file)
@@ -988,9 +988,11 @@ ssh_set_mac_length(struct ssh_peer_data *peer_data)
     char *mac_name = peer_data->mac;
     char *strip;
 
-    if (!mac_name) return;
+    if (!mac_name)
+        return;
+
+    /* wmem_strdup() never returns NULL */
     mac_name = wmem_strdup(NULL, (const gchar *)mac_name);
-    if (!mac_name) return;
 
     /* strip trailing "-etm@openssh.com" or "@openssh.com" */
     strip = strstr(mac_name, "-etm@openssh.com");