tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in Utility::GlobRecursive. 

Fixes #5604
This commit is contained in:
Gunnar Beutner 2014-02-05 13:53:56 +01:00
parent c818d94d93
commit 984ffb7421
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/base/utility.cpp
View File

@ -477,10 +477,13 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo
while (dirp) { while (dirp) {
dirent ent, *pent; dirent ent, *pent;
if (readdir_r(dirp, &ent, &pent) < 0) if (readdir_r(dirp, &ent, &pent) < 0) {
closedir(dirp);
BOOST_THROW_EXCEPTION(posix_error() BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("readdir_r") << boost::errinfo_api_function("readdir_r")
<< boost::errinfo_errno(errno)); << boost::errinfo_errno(errno));
}
if (!pent) if (!pent)
break; break;
@ -492,18 +495,24 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo
struct stat statbuf; struct stat statbuf;
if (lstat(cpath.CStr(), &statbuf) < 0) if (lstat(cpath.CStr(), &statbuf) < 0) {
closedir(dirp);
BOOST_THROW_EXCEPTION(posix_error() BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("lstat") << boost::errinfo_api_function("lstat")
<< boost::errinfo_errno(errno)); << boost::errinfo_errno(errno));
}
if (S_ISDIR(statbuf.st_mode)) if (S_ISDIR(statbuf.st_mode))
GlobRecursive(cpath, pattern, callback, type); GlobRecursive(cpath, pattern, callback, type);
if (stat(cpath.CStr(), &statbuf) < 0) if (stat(cpath.CStr(), &statbuf) < 0) {
closedir(dirp);
BOOST_THROW_EXCEPTION(posix_error() BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("stat") << boost::errinfo_api_function("stat")
<< boost::errinfo_errno(errno)); << boost::errinfo_errno(errno));
}
if (!S_ISDIR(statbuf.st_mode) && !S_ISREG(statbuf.st_mode)) if (!S_ISDIR(statbuf.st_mode) && !S_ISREG(statbuf.st_mode))
continue; continue;
@ -519,6 +528,8 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo
callback(cpath); callback(cpath);
} }
closedir(dirp);
#endif /* _WIN32 */ #endif /* _WIN32 */
return true; return true;