Merge "fc_sort: Fix leaks" am: 7f4b2ad5 am: acbf2ad3

am: 274c4e33

Change-Id: Ic46f83ae348c57ad306748d03456e62c9a4600d4

tools/fc_sort/fc_sort.c

@@ -350,6 +350,7 @@ int main(int argc, char *argv[])
 
 	/* Parse the file into a file_context linked list. */
 	line_buf = NULL;
+	buf_len = 0;
 
 	while ( getline(&line_buf, &buf_len, in_file) != -1 ){
 		line_len = strlen(line_buf);
@@ -478,15 +479,13 @@ int main(int argc, char *argv[])
 		current->next = temp;
 		current = current->next;
 		lines++;
-
-
-		free(line_buf);
-		line_buf = NULL;
 	}
+	free(line_buf);
 	fclose(in_file);
 
 	/* Create the bucket linked list from the earlier linked list. */
 	current = head->next;
+	free(head);
 	bcurrent = master =
 	    (file_context_bucket_t *)
 	    malloc(sizeof(file_context_bucket_t));