Move pointer reference to after null pointer check.

Ticket: http://madwifi.org/ticket/1650
Original Patch: Signed-off-by: Josef Kriegl <Josef.Kriegl@gmail.com>

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2856 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c
index 575e9490d3288f44f78c4a35a6d3888e714072f8..38e3a8505c47429c206e63713c95bd2390b28619 100644 (file)
--- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c
@@ -2063,16 +2063,15 @@ ieee80211_parse_rsn(struct ieee80211vap *vap, u_int8_t *frm,
 void
 ieee80211_saveie(u_int8_t **iep, const u_int8_t *ie)
 {
-       u_int ielen = ie[1] + 2;
        if ((*iep == NULL) || (ie == NULL) || ((*iep)[1] != ie[1])) {
                if (*iep != NULL)
                        FREE(*iep, M_DEVBUF);
                *iep = NULL;
                if (ie != NULL)
-                       MALLOC(*iep, void*, ielen, M_DEVBUF, M_NOWAIT);
+                       MALLOC(*iep, void*, ie[1] + 2, M_DEVBUF, M_NOWAIT);
        }
        if ((*iep != NULL) && (ie != NULL))
-               memcpy(*iep, ie, ielen);
+               memcpy(*iep, ie, ie[1] + 2);
 }
 EXPORT_SYMBOL(ieee80211_saveie);