summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2004-11-02 15:39:02 +0000
committermillert <millert@openbsd.org>2004-11-02 15:39:02 +0000
commit5183e4292d531f38dfe6f9c84416aa7580e70cdd (patch)
treea2ac19619cb579e891a4990907bf492039f34543
parentspacing, beautify dmesg output (diff)
downloadwireguard-openbsd-5183e4292d531f38dfe6f9c84416aa7580e70cdd.tar.xz
wireguard-openbsd-5183e4292d531f38dfe6f9c84416aa7580e70cdd.zip
Don't call memset() if MALLOC returns NULL; also fix the rcs ID.
From Patrick Latifi; OK reyk@
-rw-r--r--sys/net80211/ieee80211_node.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index f143467a576..a73373f2b5b 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/* $OpenBSD $ */
+/* $OpenBSD: ieee80211_node.c,v 1.2 2004/11/02 15:39:02 millert Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@@ -479,7 +479,8 @@ ieee80211_node_alloc(struct ieee80211com *ic)
struct ieee80211_node *ni;
MALLOC(ni, struct ieee80211_node *, sizeof(struct ieee80211_node),
M_80211_NODE, M_NOWAIT);
- memset(ni, 0, sizeof(struct ieee80211_node));
+ if (ni != NULL)
+ memset(ni, 0, sizeof(struct ieee80211_node));
return ni;
}