Changeset 1151:100a0925f809 in freeDiameter for extensions

Timestamp:

May 22, 2013, 10:37:48 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix a number of issues reported by cppcheck: ​http://lists.freediameter.net/pipermail/dev/2013-May/000214.html

Location:

extensions/app_diameap

Files:

• diameap_eap.c (modified) (1 diff)
• diameap_server.c (modified) (2 diffs)
• diameap_tls.c (modified) (1 diff)

extensions/app_diameap/diameap_eap.c

@@ -92 +92 @@
         *vendor = 0;
         *eaptype = TYPE_NONE;
+        if (eap_sm == NULL)
+        {
+                return EINVAL;
+        }
+
         eap_sm->selectedMethod = NULL;
-
-        if (eap_sm == NULL)
-        {
-                return EINVAL;
-        }
 
         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){
-        free(ans_attrib);
-        ans_attrib = NULL;
+                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;
         }
 }
@@ -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);
+        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;
                         }
-                }
-                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)
-        {
+                        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);
 }