Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix leaks in wifi_chip.cpp."

Browse Source
This commit is contained in:
Treehugger Robot
2019-06-20 21:06:20 +00:00
committed by Gerrit Code Review
parent 95a5978983 a20a499819
commit 102e02fbae
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wifi/1.2/default/wifi_chip.cpp
View File

@@ -111,16 +111,16 @@ std::string getP2pIfaceName() {
bool removeOldFilesInternal() { bool removeOldFilesInternal() {
time_t now = time(0); time_t now = time(0);
const time_t delete_files_before = now - kMaxRingBufferFileAgeSeconds; const time_t delete_files_before = now - kMaxRingBufferFileAgeSeconds;
DIR* dir_dump = opendir(kTombstoneFolderPath); std::unique_ptr<DIR, decltype(&closedir)> dir_dump(
opendir(kTombstoneFolderPath), closedir);
if (!dir_dump) { if (!dir_dump) {
PLOG(ERROR) << "Failed to open directory"; PLOG(ERROR) << "Failed to open directory";
return false; return false;
} }
unique_fd dir_auto_closer(dirfd(dir_dump));
struct dirent* dp; struct dirent* dp;
bool success = true; bool success = true;
std::list<std::pair<const time_t, std::string>> valid_files; std::list<std::pair<const time_t, std::string>> valid_files;
while ((dp = readdir(dir_dump))) { while ((dp = readdir(dir_dump.get()))) {
if (dp->d_type != DT_REG) { if (dp->d_type != DT_REG) {
continue; continue;
} }
@@ -242,13 +242,13 @@ bool cpioWriteFileTrailer(int out_fd) {
size_t cpioArchiveFilesInDir(int out_fd, const char* input_dir) { size_t cpioArchiveFilesInDir(int out_fd, const char* input_dir) {
struct dirent* dp; struct dirent* dp;
size_t n_error = 0; size_t n_error = 0;
DIR* dir_dump = opendir(input_dir); std::unique_ptr<DIR, decltype(&closedir)> dir_dump(opendir(input_dir),
closedir);
if (!dir_dump) { if (!dir_dump) {
PLOG(ERROR) << "Failed to open directory"; PLOG(ERROR) << "Failed to open directory";
return ++n_error; return ++n_error;
} }
unique_fd dir_auto_closer(dirfd(dir_dump)); while ((dp = readdir(dir_dump.get()))) {
while ((dp = readdir(dir_dump))) {
if (dp->d_type != DT_REG) { if (dp->d_type != DT_REG) {
continue; continue;
} }