summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authortobhe@openbsd.org <tobhe@openbsd.org>2019-12-16 13:58:53 +0000
committerDarren Tucker <dtucker@dtucker.net>2019-12-20 14:25:08 +1100
commitf65cf1163ff01531ae02f3f9210391d0d692f699 (patch)
tree3dc82d371462c11bd6116e4240e5e116fe0bed14 /packet.c
parent57634bfc5708477826c0be265ddc59b9d83e4886 (diff)
upstream: strdup may return NULL if memory allocation fails. Use
the safer xstrdup which fatals on allocation failures. ok markus@ OpenBSD-Commit-ID: 8b608d387120630753cbcb8110e0b019c0c9a0d0
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/packet.c b/packet.c
index 7a703d695..2b50ef415 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.286 2019/06/28 13:35:04 deraadt Exp $ */ 1/* $OpenBSD: packet.c,v 1.287 2019/12/16 13:58:53 tobhe Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -530,9 +530,9 @@ ssh_remote_ipaddr(struct ssh *ssh)
530 ssh->local_ipaddr = get_local_ipaddr(sock); 530 ssh->local_ipaddr = get_local_ipaddr(sock);
531 ssh->local_port = get_local_port(sock); 531 ssh->local_port = get_local_port(sock);
532 } else { 532 } else {
533 ssh->remote_ipaddr = strdup("UNKNOWN"); 533 ssh->remote_ipaddr = xstrdup("UNKNOWN");
534 ssh->remote_port = 65535; 534 ssh->remote_port = 65535;
535 ssh->local_ipaddr = strdup("UNKNOWN"); 535 ssh->local_ipaddr = xstrdup("UNKNOWN");
536 ssh->local_port = 65535; 536 ssh->local_port = 65535;
537 } 537 }
538 } 538 }