mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Misc leaks plugging

Browse source
This commit is contained in:
Thibault Saunier 2019-06-18 17:43:56 -04:00
parent a994dd0ca8
commit 5b52c38b85
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
validate/gst/validate/gst-validate-scenario.c
View file

@ -523,7 +523,7 @@ _replace_variables_in_string (GstValidateScenario * scenario,
gchar *tmp, *varname, *pvarname = g_match_info_fetch (match_info, 0); gchar *tmp, *varname, *pvarname = g_match_info_fetch (match_info, 0);
varname_len = strlen (pvarname); varname_len = strlen (pvarname);
varname = g_malloc (sizeof (gchar) * varname_len - 3); varname = g_malloc (sizeof (gchar) * varname_len - 2);
strncpy (varname, &pvarname[2], varname_len - 3); strncpy (varname, &pvarname[2], varname_len - 3);
varname[varname_len - 3] = '\0'; varname[varname_len - 3] = '\0';
@ -542,6 +542,7 @@ _replace_variables_in_string (GstValidateScenario * scenario,
tmp = g_strdup_printf ("\\$\\(%s\\)", varname); tmp = g_strdup_printf ("\\$\\(%s\\)", varname);
replace_regex = g_regex_new (tmp, 0, 0, NULL); replace_regex = g_regex_new (tmp, 0, 0, NULL);
g_free (tmp);
tmpstring = string; tmpstring = string;
string = g_regex_replace (replace_regex, string, -1, 0, var_value, 0, NULL); string = g_regex_replace (replace_regex, string, -1, 0, var_value, 0, NULL);
@ -549,6 +550,7 @@ _replace_variables_in_string (GstValidateScenario * scenario,
g_free (tmpstring); g_free (tmpstring);
g_regex_unref (replace_regex); g_regex_unref (replace_regex);
g_free (pvarname); g_free (pvarname);
g_free (varname);
g_match_info_next (match_info, NULL); g_match_info_next (match_info, NULL);
} }
@ -3544,6 +3546,7 @@ gst_validate_scenario_load (GstValidateScenario * scenario,
gchar *tmp_scenarios_path = gchar *tmp_scenarios_path =
g_strdup_printf ("%s%c%s", scenarios_path, G_SEARCHPATH_SEPARATOR, g_strdup_printf ("%s%c%s", scenarios_path, G_SEARCHPATH_SEPARATOR,
relative_dir); relative_dir);
g_free (relative_dir);
g_free (scenarios_path); g_free (scenarios_path);
scenarios_path = tmp_scenarios_path; scenarios_path = tmp_scenarios_path;
@ -3995,10 +3998,12 @@ static gboolean
_add_description (GQuark field_id, const GValue * value, KeyFileGroupName * kfg) _add_description (GQuark field_id, const GValue * value, KeyFileGroupName * kfg)
{ {
gchar *tmp = gst_value_serialize (value); gchar *tmp = gst_value_serialize (value);
gchar *tmpcompress = g_strcompress (tmp);
g_key_file_set_string (kfg->kf, kfg->group_name, g_key_file_set_string (kfg->kf, kfg->group_name,
g_quark_to_string (field_id), g_strcompress (tmp)); g_quark_to_string (field_id), tmpcompress);
g_free (tmpcompress);
g_free (tmp); g_free (tmp);
return TRUE; return TRUE;
@ -4098,6 +4103,7 @@ gst_validate_list_scenarios (gchar ** scenarios, gint num_scenarios,
"gstreamer-" GST_API_VERSION, "validate", GST_VALIDATE_SCENARIO_DIRECTORY, "gstreamer-" GST_API_VERSION, "validate", GST_VALIDATE_SCENARIO_DIRECTORY,
NULL); NULL);
GFile *dir = g_file_new_for_path (tldir); GFile *dir = g_file_new_for_path (tldir);
g_free (tldir);
kf = g_key_file_new (); kf = g_key_file_new ();
if (num_scenarios > 0) { if (num_scenarios > 0) {
@ -4123,7 +4129,6 @@ gst_validate_list_scenarios (gchar ** scenarios, gint num_scenarios,
_list_scenarios_in_dir (dir, kf); _list_scenarios_in_dir (dir, kf);
g_object_unref (dir); g_object_unref (dir);
g_free (tldir);
tldir = g_build_filename (GST_DATADIR, "gstreamer-" GST_API_VERSION, tldir = g_build_filename (GST_DATADIR, "gstreamer-" GST_API_VERSION,
"validate", GST_VALIDATE_SCENARIO_DIRECTORY, NULL); "validate", GST_VALIDATE_SCENARIO_DIRECTORY, NULL);
@ -4151,10 +4156,13 @@ done:
result = g_key_file_to_data (kf, &datalength, &err); result = g_key_file_to_data (kf, &datalength, &err);
g_print ("All scenarios available:\n%s", result); g_print ("All scenarios available:\n%s", result);
if (output_file && !err) if (output_file && !err) {
if (!g_file_set_contents (output_file, result, datalength, &err)) { if (!g_file_set_contents (output_file, result, datalength, &err)) {
GST_WARNING ("Error writing to file '%s'", output_file); GST_WARNING ("Error writing to file '%s'", output_file);
} }
}
g_free (result);
if (env_scenariodir) if (env_scenariodir)
g_strfreev (env_scenariodir); g_strfreev (env_scenariodir);

1
validate/gst/validate/media-descriptor-writer.c
View file

@ -139,6 +139,7 @@ serialize_filenode (GstValidateMediaDescriptorWriter * writer)
g_free (tmpstr); g_free (tmpstr);
tmpstr = g_markup_printf_escaped (" <streams caps=\"%s\">\n", caps_str); tmpstr = g_markup_printf_escaped (" <streams caps=\"%s\">\n", caps_str);
g_string_append (res, tmpstr); g_string_append (res, tmpstr);
g_free (tmpstr);
g_free (caps_str); g_free (caps_str);
for (tmp = filenode->streams; tmp; tmp = tmp->next) { for (tmp = filenode->streams; tmp; tmp = tmp->next) {
GList *tmp3; GList *tmp3;

1
validate/tools/gst-validate.c
View file

@ -397,6 +397,7 @@ main (int argc, gchar ** argv)
gst_validate_init (); gst_validate_init ();
if (list_scenarios || output_file) { if (list_scenarios || output_file) {
g_option_context_free (ctx);
if (gst_validate_list_scenarios (argv + 1, argc - 1, output_file)) if (gst_validate_list_scenarios (argv + 1, argc - 1, output_file))
return 1; return 1;
return 0; return 0;