summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2018-07-20 02:17:19 +0000
committerCy Schubert <cy@FreeBSD.org>2018-07-20 02:17:19 +0000
commit64987377c23fdc4c6fe7e907d32f9f9580c1c128 (patch)
treef21571f13cf88c72e01580a064e551bb2fa0ee42 /contrib
parente5817618766b7b2f5b903a9557f40f7e10f9848f (diff)
downloadsrc-test-64987377c23fdc4c6fe7e907d32f9f9580c1c128.tar.gz
src-test-64987377c23fdc4c6fe7e907d32f9f9580c1c128.zip
To reduce our diff between our sources and our upline, sync up
with upline. Also making it easier to read. Obtained from: diffing base with ports X-MFC-with: r336203
Notes
Notes: svn path=/head/; revision=336530
Diffstat (limited to 'contrib')
-rw-r--r--contrib/wpa/wpa_supplicant/wnm_sta.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/wpa/wpa_supplicant/wnm_sta.c b/contrib/wpa/wpa_supplicant/wnm_sta.c
index 8307f338af7f9..67a07ff7b1e7c 100644
--- a/contrib/wpa/wpa_supplicant/wnm_sta.c
+++ b/contrib/wpa/wpa_supplicant/wnm_sta.c
@@ -198,8 +198,8 @@ static void wnm_sleep_mode_exit_success(struct wpa_supplicant *wpa_s,
return;
}
- while (ptr + 1 < end) {
- if (ptr + 2 + ptr[1] > end) {
+ while (end - ptr > 1) {
+ if (2 + ptr[1] > end - ptr) {
wpa_printf(MSG_DEBUG, "WNM: Invalid Key Data element "
"length");
if (end > ptr) {