diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2016-07-03 16:04:19 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-03 16:25:26 +0000 |
| commit | d4395252f54c6b6b84951433cb195b243696e390 (patch) | |
| tree | 26a86f66b34da151a2067005552b6a22a5b93390 | |
| parent | 79fb9fdb4139045db728746feceb841ea33933df (diff) | |
ssh: wmem_strdup() never returns NULL
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>
| -rw-r--r-- | epan/dissectors/packet-ssh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 43cec6a233..d8cd0b0f29 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -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"); |