From: Jouni Malinen Date: Sun, 16 Dec 2012 17:48:39 +0000 (+0200) Subject: WNM: Skip os_memcpy in wnmtfs_ie is NULL X-Git-Tag: hostap_2_0~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8e93a1a01c36181a93109e955d465ccd9608ecb;p=thirdparty%2Fhostap.git WNM: Skip os_memcpy in wnmtfs_ie is NULL It is cleaner to skip the memcpy call instead of trusting on the length parameter being 0 in this case. Signed-hostap: Jouni Malinen --- diff --git a/src/ap/wnm_ap.c b/src/ap/wnm_ap.c index 51a0e40df..13961e061 100644 --- a/src/ap/wnm_ap.c +++ b/src/ap/wnm_ap.c @@ -132,7 +132,8 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd, os_memcpy(pos, &wnmsleep_ie, wnmsleep_ie_len); /* copy TFS IE here */ pos += wnmsleep_ie_len; - os_memcpy(pos, wnmtfs_ie, wnmtfs_ie_len); + if (wnmtfs_ie) + os_memcpy(pos, wnmtfs_ie, wnmtfs_ie_len); len = 1 + sizeof(mgmt->u.action.u.wnm_sleep_resp) + gtk_elem_len + igtk_elem_len + wnmsleep_ie_len + wnmtfs_ie_len;