Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Update from nsfw/master to include memory leak fixes #8

Merged
merged 3 commits into from
Jun 13, 2019
Merged

Update from nsfw/master to include memory leak fixes #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2818e9e
Fix memory leaks caused by unneeded strdup()
Leo1003 Jun 11, 2019
cb017fc
Merge pull request #74 from Leo1003/fix_memory_leaks
implausible Jun 11, 2019
6b55b56
Merge remote-tracking branch 'nsfw/master' into update-from-nsfw
Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/linux/InotifyEventLoop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ void InotifyEventLoop::work() {
}

if (isDirectoryEvent) {
inotifyService->createDirectory(event->wd, strdup(event->name));
inotifyService->createDirectory(event->wd, event->name);
} else {
inotifyService->create(event->wd, strdup(event->name));
inotifyService->create(event->wd, event->name);
}
};

Expand All @@ -49,7 +49,7 @@ void InotifyEventLoop::work() {
return;
}

inotifyService->modify(event->wd, strdup(event->name));
inotifyService->modify(event->wd, event->name);
};

auto remove = [&event, &isDirectoryRemoval, &inotifyService]() {
Expand All @@ -60,7 +60,7 @@ void InotifyEventLoop::work() {
if (isDirectoryRemoval) {
inotifyService->removeDirectory(event->wd);
} else {
inotifyService->remove(event->wd, strdup(event->name));
inotifyService->remove(event->wd, event->name);
}
};

Expand Down Expand Up @@ -133,7 +133,7 @@ void InotifyEventLoop::work() {

renameStart();
} else if (event->mask & (uint32_t)IN_MOVE_SELF) {
inotifyService->remove(event->wd, strdup(event->name));
inotifyService->remove(event->wd, event->name);
inotifyService->removeDirectory(event->wd);
}
} while((position += sizeof(struct inotify_event) + event->len) < bytesRead);
Expand Down