From: Tom Yu <tlyu@mit.edu>
Date: Tue, 18 Jan 2005 17:51:38 +0000 (+0000)
Subject: pullup from trunk
X-Git-Tag: krb5-1.4.3-beta1~101
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8ecdb376c90f3fc4372c79f94c30cb2ebd7f665;p=krb5.git

pullup from trunk

ticket: 2879
version_fixed: 1.4
component: krb5-libs

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17054 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 985664014..2247776e6 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -2,8 +2,6 @@
 
 	* prof_file.c (profile_free_file_data): Destroy mutex before
 	freeing containing structure.
-	(profile_open_file): If mutex creation fails, free storage
-	directly instead of calling profile_close_file.
 
 2004-12-14  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/util/profile/prof_file.c b/src/util/profile/prof_file.c
index cada52505..9b0048c9c 100644
--- a/src/util/profile/prof_file.c
+++ b/src/util/profile/prof_file.c
@@ -579,12 +579,13 @@ static void profile_free_file_data(prf_data_t data)
 	    }
 	}
     }
-	if (data->root)
-		profile_free_node(data->root);
-	if (data->comment)
-		free(data->comment);
-	data->magic = 0;
-	free(data);
+    if (data->root)
+	profile_free_node(data->root);
+    if (data->comment)
+	free(data->comment);
+    data->magic = 0;
+    k5_mutex_destroy(&data->lock);
+    free(data);
     scan_shared_trees_locked();
 }