summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhshoexer <hshoexer@openbsd.org>2005-01-31 10:30:49 +0000
committerhshoexer <hshoexer@openbsd.org>2005-01-31 10:30:49 +0000
commit4ab75681aa5799b843542222e4d82e3d13b2a639 (patch)
tree2b3948fd011b59a9ad7b0a143072086561bd16d8
parentRemove unused stuff. (diff)
downloadwireguard-openbsd-4ab75681aa5799b843542222e4d82e3d13b2a639.tar.xz
wireguard-openbsd-4ab75681aa5799b843542222e4d82e3d13b2a639.zip
Avoid dereferencing a NULL pointer
ok msf
-rw-r--r--sbin/isakmpd/exchange.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c
index d5b2f5333e3..8218e21b6a1 100644
--- a/sbin/isakmpd/exchange.c
+++ b/sbin/isakmpd/exchange.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exchange.c,v 1.105 2004/12/06 12:28:21 ho Exp $ */
+/* $OpenBSD: exchange.c,v 1.106 2005/01/31 10:30:49 hshoexer Exp $ */
/* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */
/*
@@ -1141,9 +1141,9 @@ exchange_setup_p2(struct message *msg, u_int8_t doi)
exchange->cookies + ISAKMP_HDR_ICOOKIE_LEN);
GET_ISAKMP_HDR_MESSAGE_ID(buf, exchange->message_id);
#if defined (USE_NAT_TRAVERSAL)
- if (msg->isakmp_sa->flags & SA_FLAG_NAT_T_ENABLE)
+ if (msg->isakmp_sa && (msg->isakmp_sa->flags & SA_FLAG_NAT_T_ENABLE))
exchange->flags |= EXCHANGE_FLAG_NAT_T_ENABLE;
- if (msg->isakmp_sa->flags & SA_FLAG_NAT_T_KEEPALIVE)
+ if (msg->isakmp_sa && (msg->isakmp_sa->flags & SA_FLAG_NAT_T_KEEPALIVE))
exchange->flags |= EXCHANGE_FLAG_NAT_T_KEEPALIVE;
#endif
exchange_enter(exchange);