From: Jouni Malinen <j@w1.fi>
Date: Mon, 31 Aug 2015 09:49:58 +0000 (+0300)
Subject: WPS: Merge event_send_start() error paths
X-Git-Tag: hostap_2_5~85
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=b8e20236c1b9847f66d453c229d34247be868b15;hp=476daa0585bed2b87460b062a6e744908c2a769f;p=mech_eap.git

WPS: Merge event_send_start() error paths

There is no need to keep these separate.

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

diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
index 2c8ed4f..94aae75 100644
--- a/src/wps/wps_upnp_event.c
+++ b/src/wps/wps_upnp_event.c
@@ -276,11 +276,9 @@ static int event_send_start(struct subscription *s)
 	 * Assume we are called ONLY with no current event and ONLY with
 	 * nonempty event queue and ONLY with at least one address to send to.
 	 */
-	if (dl_list_empty(&s->addr_list))
-		return -1;
-	if (s->current_event)
-		return -1;
-	if (dl_list_empty(&s->event_queue))
+	if (dl_list_empty(&s->addr_list) ||
+	    s->current_event ||
+	    dl_list_empty(&s->event_queue))
 		return -1;
 
 	s->current_event = e = event_dequeue(s);