Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / src / wps / wps_upnp_event.c

diff --git a/libeap/src/wps/wps_upnp_event.c b/libeap/src/wps/wps_upnp_event.c
index 2c8ed4f..94aae75 100644 (file)
--- a/libeap/src/wps/wps_upnp_event.c
+++ b/libeap/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);