From 2c0385c1c17faf030a2097bb31c84970c0861152 Mon Sep 17 00:00:00 2001 From: xwidghet Date: Sun, 18 Jun 2017 15:48:18 -0700 Subject: [PATCH] Fix fileset leak. --- src/RageUtil_FileDB.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/RageUtil_FileDB.cpp b/src/RageUtil_FileDB.cpp index 9340489b2f..4997fe560a 100644 --- a/src/RageUtil_FileDB.cpp +++ b/src/RageUtil_FileDB.cpp @@ -441,20 +441,15 @@ void FilenameDB::DelFileSet( map::iterator dir ) FileSet *fs = dir->second; - /* Remove any stale dirp pointers. */ + /* Remove any stale dirp pointers. */ for( map::iterator it = dirs.begin(); it != dirs.end(); ++it ) { - if (it->first == dir->first) + FileSet *Clean = it->second; + for( set::iterator f = Clean->files.begin(); f != Clean->files.end(); ++f ) { - FileSet *Clean = it->second; - for (set::iterator f = Clean->files.begin(); f != Clean->files.end(); ++f) - { - File &ff = (File &)*f; - if (ff.dirp == fs) + File &ff = (File &) *f; + if( ff.dirp == fs ) ff.dirp = NULL; - } - - break; } }