diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index e5b52fa20..5f65b7dd1 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -553,8 +553,8 @@ static enum ssid_match_result ssid_match(struct hostapd_data *hapd,
 
 	pos = ssid_list;
 	end = ssid_list + ssid_list_len;
-	while (pos + 1 <= end) {
-		if (pos + 2 + pos[1] > end)
+	while (end - pos >= 1) {
+		if (2 + pos[1] > end - pos)
 			break;
 		if (pos[1] == 0)
 			wildcard = 1;