]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
WNM: Skip os_memcpy in wnmtfs_ie is NULL
authorJouni Malinen <j@w1.fi>
Sun, 16 Dec 2012 17:48:39 +0000 (19:48 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 16 Dec 2012 17:48:39 +0000 (19:48 +0200)
It is cleaner to skip the memcpy call instead of trusting on the
length parameter being 0 in this case.

Signed-hostap: Jouni Malinen <j@w1.fi>

src/ap/wnm_ap.c

index 51a0e40df5ae04ca65a3267d7931c0ae90c037bf..13961e06134b43e37acf5e7314f79d30ec13d4df 100644 (file)
@@ -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;