exception handling-related cleanup

diff --git a/mech_eap/util_radius.cpp b/mech_eap/util_radius.cpp
index d1ee24b..5a109fe 100644 (file)
--- a/mech_eap/util_radius.cpp
+++ b/mech_eap/util_radius.cpp
@@ -190,7 +190,6 @@ copyAvps(const VALUE_PAIR *src)
         if (vpcopy == NULL) {
             pairfree(&dst);
             throw std::bad_alloc();
-            return NULL;
         }
         *pDst = vpcopy;
         pDst = &vpcopy->next;
@@ -673,10 +672,8 @@ jsonToAvp(VALUE_PAIR **pVp, JSONObject &obj)
         /* Assume unknown attributes are octet strings */
         vp = paircreate(attrid, PW_TYPE_OCTETS);
     }
-    if (vp == NULL) {
+    if (vp == NULL)
         throw std::bad_alloc();
-        goto fail;
-    }
 
     switch (vp->type) {
     case PW_TYPE_INTEGER: