Changes in / [1152:7284e41faa46:1150:611c5691661d] in freeDiameter

Files:

• extensions/app_diameap/diameap_eap.c (modified) (1 diff)
• extensions/app_diameap/diameap_server.c (modified) (2 diffs)
• extensions/app_diameap/diameap_tls.c (modified) (1 diff)
• libfdproto/dispatch.c (modified) (2 diffs)

extensions/app_diameap/diameap_eap.c

@@ -92 +92 @@
         *vendor = 0;
         *eaptype = TYPE_NONE;
+        eap_sm->selectedMethod = NULL;
+
         if (eap_sm == NULL)
         {
                 return EINVAL;
         }
-
-        eap_sm->selectedMethod = NULL;
 
         if (eap_sm->user.userid == NULL)

extensions/app_diameap/diameap_server.c

@@ -1131 +1131 @@
 static void free_ans_attrib(struct avp_attribute * ans_attrib)
 {
+        if (ans_attrib->tofree == 1)
+        {
+                if(ans_attrib->value.os.data){
+                free(ans_attrib->value.os.data);
+                ans_attrib->value.os.data = NULL;
+                }
+        }
         if(ans_attrib){
-                if (ans_attrib->tofree == 1)
-                {
-                        if(ans_attrib->value.os.data){
-                        free(ans_attrib->value.os.data);
-                        ans_attrib->value.os.data = NULL;
-                        }
-                }
-                free(ans_attrib);
-                ans_attrib = NULL;
+        free(ans_attrib);
+        ans_attrib = NULL;
         }
 }
@@ -1185 +1185 @@
 {
 
+        if (diameap_sm->eap_sm.user.userid != NULL)
+        {
+                free(diameap_sm->eap_sm.user.userid);
+                diameap_sm->eap_sm.user.userid = NULL;
+        }
+
+        if (diameap_sm->eap_sm.user.password != NULL)
+        {
+                free(diameap_sm->eap_sm.user.password);
+                diameap_sm->eap_sm.user.password = NULL;
+        }
+
+        diameap_sm->eap_sm.selectedMethod = NULL;
+
+        if (diameap_sm->eap_sm.methodData != NULL)
+        {
+
+                struct plugin * cplugin;
+                if (diameap_plugin_get(diameap_sm->eap_sm.currentVendor,
+                                diameap_sm->eap_sm.currentMethod, &cplugin))
+                {
+                        TRACE_DEBUG(INFO,"%sUnable to access EAP Method plugin {Type=%d, Vendor=%d}.",DIAMEAP_EXTENSION,diameap_sm->eap_sm.currentMethod,diameap_sm->eap_sm.currentVendor);
+                }
+
+                if (cplugin->eap_method_free)
+                {
+                        (*cplugin->eap_method_free)(diameap_sm->eap_sm.methodData);
+                        diameap_sm->eap_sm.methodData = NULL;
+                }
+                else
+                {
+                        TRACE_DEBUG(INFO,"%s[%s plugin] datafree function not available.",DIAMEAP_EXTENSION,cplugin->methodname);
+                        if (diameap_sm->eap_sm.methodData != NULL)
+                        {
+                                free(diameap_sm->eap_sm.methodData);
+                                diameap_sm->eap_sm.methodData = NULL;
+                        }
+                }
+                if (diameap_sm->eap_sm.methodData)
+                {
+                        TRACE_DEBUG(INFO,"%sSession state was not been freed correctly!!!",DIAMEAP_EXTENSION);
+                }
+        }
+
+        if (diameap_sm->failedavp != NULL)
+        {
+                CHECK_FCT_DO(fd_msg_free(diameap_sm->failedavp), );
+        }
+
+        if (diameap_sm->lastReqEAPavp != NULL)
+        {
+                CHECK_FCT_DO(fd_msg_free(diameap_sm->lastReqEAPavp), );
+        }
+
+        CHECK_FCT_DO(diameap_unlink_attributes_lists(diameap_sm), );
+
         if (diameap_sm != NULL)
         {
-                if (diameap_sm->eap_sm.user.userid != NULL)
-                {
-                        free(diameap_sm->eap_sm.user.userid);
-                        diameap_sm->eap_sm.user.userid = NULL;
-                }
-
-                if (diameap_sm->eap_sm.user.password != NULL)
-                {
-                        free(diameap_sm->eap_sm.user.password);
-                        diameap_sm->eap_sm.user.password = NULL;
-                }
-
-                diameap_sm->eap_sm.selectedMethod = NULL;
-
-                if (diameap_sm->eap_sm.methodData != NULL)
-                {
-
-                        struct plugin * cplugin;
-                        if (diameap_plugin_get(diameap_sm->eap_sm.currentVendor,
-                                        diameap_sm->eap_sm.currentMethod, &cplugin))
-                        {
-                                TRACE_DEBUG(INFO,"%sUnable to access EAP Method plugin {Type=%d, Vendor=%d}.",DIAMEAP_EXTENSION,diameap_sm->eap_sm.currentMethod,diameap_sm->eap_sm.currentVendor);
-                        }
-
-                        if (cplugin->eap_method_free)
-                        {
-                                (*cplugin->eap_method_free)(diameap_sm->eap_sm.methodData);
-                                diameap_sm->eap_sm.methodData = NULL;
-                        }
-                        else
-                        {
-                                TRACE_DEBUG(INFO,"%s[%s plugin] datafree function not available.",DIAMEAP_EXTENSION,cplugin->methodname);
-                                if (diameap_sm->eap_sm.methodData != NULL)
-                                {
-                                        free(diameap_sm->eap_sm.methodData);
-                                        diameap_sm->eap_sm.methodData = NULL;
-                                }
-                        }
-                        if (diameap_sm->eap_sm.methodData)
-                        {
-                                TRACE_DEBUG(INFO,"%sSession state was not been freed correctly!!!",DIAMEAP_EXTENSION);
-                        }
-                }
-
-                if (diameap_sm->failedavp != NULL)
-                {
-                        CHECK_FCT_DO(fd_msg_free(diameap_sm->failedavp), );
-                }
-
-                if (diameap_sm->lastReqEAPavp != NULL)
-                {
-                        CHECK_FCT_DO(fd_msg_free(diameap_sm->lastReqEAPavp), );
-                }
-
-                CHECK_FCT_DO(diameap_unlink_attributes_lists(diameap_sm), );
-
                 free(diameap_sm);
                 diameap_sm = NULL;

extensions/app_diameap/diameap_tls.c

@@ -396 +396 @@
         */
         fprintf(stderr, "-------------End Dump EAP-TLS msg-------------\n");
-        
-        free(data);
 }
 

libfdproto/dispatch.c

@@ -123 +123 @@
         struct fd_list * cb_list = NULL;
         struct disp_hdl * new;
-        struct dict_object * type_enum = NULL, * type_avp;
+        struct dict_object * type_enum, * type_avp;
         struct dictionary  * dict = NULL;
         
@@ -150 +150 @@
                         if (dict) {
                                 CHECK_FCT( fd_dict_search(dict, DICT_TYPE, TYPE_OF_AVP, when->avp, &type_avp, EINVAL) );
-                                if (type_enum) {
-                                        CHECK_PARAMS( type_enum == type_avp );
-                                }
+                                CHECK_PARAMS( type_enum == type_avp );
                         }
                         break;