From 92325e70909237808c06fd08382d8f8b7b451cd6 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 31 Aug 2015 12:29:09 +0300 Subject: [PATCH] WPS: Merge SetSelectedRegistrar parsing error returns There is no need to maintain two error paths for this. Signed-off-by: Jouni Malinen --- src/wps/wps_upnp_ap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/wps/wps_upnp_ap.c b/src/wps/wps_upnp_ap.c index 2949f14..cca3905 100644 --- a/src/wps/wps_upnp_ap.c +++ b/src/wps/wps_upnp_ap.c @@ -34,10 +34,8 @@ int upnp_er_set_selected_registrar(struct wps_registrar *reg, wpa_hexdump_buf(MSG_MSGDUMP, "WPS: SetSelectedRegistrar attributes", msg); - if (wps_validate_upnp_set_selected_registrar(msg) < 0) - return -1; - - if (wps_parse_msg(msg, &attr) < 0) + if (wps_validate_upnp_set_selected_registrar(msg) < 0 || + wps_parse_msg(msg, &attr) < 0) return -1; s->reg = reg; -- 2.1.4