mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate-scenario: Don't leak GFile

Browse source 
And use specific variables for clarity in loops.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
This commit is contained in:
Edward Hervey 2022-11-12 08:18:42 +01:00 committed by Edward Hervey
parent 3f95779c30
commit e821b65a64
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5534,9 +5534,9 @@ gst_validate_list_scenarios (gchar ** scenarios, gint num_scenarios,
if (!_parse_scenario (file, kf)) { if (!_parse_scenario (file, kf)) {
GST_ERROR ("Could not parse scenario: %s", scenarios[i]); GST_ERROR ("Could not parse scenario: %s", scenarios[i]);
gst_object_unref (file);
res = 1; res = 1;
} }
g_clear_object (&file);
} }
goto done; goto done;
@ -5547,29 +5547,30 @@ gst_validate_list_scenarios (gchar ** scenarios, gint num_scenarios,
env_scenariodir = g_strsplit (envvar, ":", 0); env_scenariodir = g_strsplit (envvar, ":", 0);
_list_scenarios_in_dir (dir, kf); _list_scenarios_in_dir (dir, kf);
g_object_unref (dir); g_clear_object (&dir);
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);
dir = g_file_new_for_path (tldir); dir = g_file_new_for_path (tldir);
_list_scenarios_in_dir (dir, kf); _list_scenarios_in_dir (dir, kf);
g_object_unref (dir); g_clear_object (&dir);
g_free (tldir); g_free (tldir);
if (env_scenariodir) { if (env_scenariodir) {
guint i; guint i;
GFile *subfile;
for (i = 0; env_scenariodir[i]; i++) { for (i = 0; env_scenariodir[i]; i++) {
dir = g_file_new_for_path (env_scenariodir[i]); subfile = g_file_new_for_path (env_scenariodir[i]);
_list_scenarios_in_dir (dir, kf); _list_scenarios_in_dir (subfile, kf);
g_object_unref (dir); g_clear_object (&subfile);
} }
} }
/* Hack to make it work within the development environment */ /* Hack to make it work within the development environment */
dir = g_file_new_for_path ("data/scenarios"); dir = g_file_new_for_path ("data/scenarios");
_list_scenarios_in_dir (dir, kf); _list_scenarios_in_dir (dir, kf);
g_object_unref (dir); g_clear_object (&dir);
done: done:
result = g_key_file_to_data (kf, &datalength, &err); result = g_key_file_to_data (kf, &datalength, &err);
@ -5592,6 +5593,7 @@ done:
res = FALSE; res = FALSE;
} }
g_clear_object (&dir);
g_key_file_free (kf); g_key_file_free (kf);