svn commit: r336530 - head/contrib/wpa/wpa_supplicant

Cy Schubert cy at FreeBSD.org
Fri Jul 20 02:17:21 UTC 2018


Author: cy
Date: Fri Jul 20 02:17:19 2018
New Revision: 336530
URL: https://svnweb.freebsd.org/changeset/base/336530

Log:
  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

Modified:
  head/contrib/wpa/wpa_supplicant/wnm_sta.c

Modified: head/contrib/wpa/wpa_supplicant/wnm_sta.c
==============================================================================
--- head/contrib/wpa/wpa_supplicant/wnm_sta.c	Fri Jul 20 02:04:10 2018	(r336529)
+++ head/contrib/wpa/wpa_supplicant/wnm_sta.c	Fri Jul 20 02:17:19 2018	(r336530)
@@ -198,8 +198,8 @@ static void wnm_sleep_mode_exit_success(struct wpa_sup
 		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) {


More information about the svn-src-all mailing list