Changeset 9224

Timestamp:

03/08/12 17:32:59 (15 months ago)

Author:

sampson

Message:

Fixed memory leak with mntent structs

Files:

• trunk/src/common/misc/pvfs2-util.c (modified) (3 diffs)

trunk/src/common/misc/pvfs2-util.c

@@ -1787 +1787 @@
             int j;
             for (j=0; j<mntent->num_pvfs_config_servers; j++)
+            {            
                 if (mntent->pvfs_config_servers[j])
+                {
+                    if (mntent->pvfs_config_servers[j] == 
+                        mntent->the_pvfs_config_server)
+                    {
+                        /* don't free further down */
+                        mntent->the_pvfs_config_server = NULL;
+                    }
                     free(mntent->pvfs_config_servers[j]);
+                }
+            }
             free(mntent->pvfs_config_servers);
             mntent->pvfs_config_servers = NULL;
@@ -1807 +1817 @@
             free(mntent->mnt_opts);
             mntent->mnt_opts = NULL;
+        }
+        if (mntent->the_pvfs_config_server)           
+        {
+            free(mntent->the_pvfs_config_server);
+            mntent->the_pvfs_config_server = NULL;
         }
 
@@ -1851 +1866 @@
         }
 
-        /* nlmills: TODO: this copy will leak memory. fix that */
         dest_mntent->the_pvfs_config_server = 
             strdup(src_mntent->the_pvfs_config_server);