From 0e96d84079c1792523d99b6bbec5878d11f5c8e4 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Mon, 16 Jun 2014 20:39:45 +1000 Subject: Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks --- libs/pbd/file_utils.cc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'libs/pbd/file_utils.cc') diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index 756bd24fe4..552012d227 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -229,16 +229,12 @@ void copy_files(const std::string & from_path, const std::string & to_dir) { PathScanner scanner; - vector* files = scanner (from_path, accept_all_files, 0, true, false); + vector files = scanner (from_path, accept_all_files, 0, true, false); - if (files) { - for (vector::iterator i = files->begin(); i != files->end(); ++i) { - std::string from = Glib::build_filename (from_path, **i); - std::string to = Glib::build_filename (to_dir, **i); - copy_file (from, to); - } - vector_delete (files); - delete (files); + for (vector::iterator i = files.begin(); i != files.end(); ++i) { + std::string from = Glib::build_filename (from_path, *i); + std::string to = Glib::build_filename (to_dir, *i); + copy_file (from, to); } } -- cgit v1.2.3