Bunch of minor fixes.

diff --git a/mono/profiler/arg-parsing.c b/mono/profiler/arg-parsing.c
index 233d5a5ada12313990a2bf1906552f3d6c1f1218..27a2bc41cb6b4df6bb5825a7b0faa7ffe3ae71c5 100644 (file)
--- a/mono/profiler/arg-parsing.c
+++ b/mono/profiler/arg-parsing.c
@@ -217,6 +217,8 @@ proflog_parse_args (ProfilerConfig *config, const char *desc)
                parse_arg (buffer, config);
        }
 
+       g_free (buffer);
+
        //Compure config effective mask
        config->effective_mask = config->enable_mask & ~config->disable_mask;
 }

diff --git a/mono/profiler/mono-profiler-log.c b/mono/profiler/mono-profiler-log.c
index 2f8ed6387c71d87cd9875b9c74dad405dffad8d3..cccbd030d6e8535ace307db3bb1dffdf04ebcabf 100644 (file)
--- a/mono/profiler/mono-profiler-log.c
+++ b/mono/profiler/mono-profiler-log.c
@@ -3737,9 +3737,6 @@ parse_cov_filter_file (GPtrArray *filters, const char *file)
        FILE *filter_file;
        char *line, *content;
 
-       if (filters == NULL)
-               filters = g_ptr_array_new ();
-
        filter_file = fopen (file, "r");
        if (filter_file == NULL) {
                fprintf (stderr, "Unable to open %s\n", file);
@@ -4587,10 +4584,8 @@ mono_profiler_startup (const char *desc)
        GPtrArray *filters = NULL;
        MonoProfiler *prof;
 
-       if (desc [3] == ':')
-               proflog_parse_args (&config, desc + 4);
-       else
-               proflog_parse_args (&config, "");
+       proflog_parse_args (&config, desc [3] == ':' ? desc + 4 : "");
+
        //XXX maybe later cleanup to use config directly
        nocalls = !(config.effective_mask & PROFLOG_CALL_EVENTS);
        no_counters = !(config.effective_mask & PROFLOG_COUNTER_EVENTS);