Fix a lambda capture problem in TextDumpsysSection

The [&] capture does not handle smart pointers (unique_ptr, unique_fd
etc) well, which lead to leaked pointers. Fix by explicitly move the
smart pointers.

Bug: 158097879
Test: Build, flash and take an incident report. Verify no crash
Change-Id: I5150aa3dddf9d59c1c9d6d32370370e8cde23946
This commit is contained in:
Mike Ma
2020-06-05 00:51:22 -07:00
parent bb9ea4e1fa
commit 4686c24f53

View File

@@ -477,14 +477,15 @@ status_t TextDumpsysSection::Execute(ReportWriter* writer) const {
// Run dumping thread
const uint64_t start = Nanotime();
std::thread worker([&]() {
std::thread worker([write_fd = std::move(dumpPipe.writeFd()), service = std::move(service),
this]() mutable {
// Don't crash the service if writing to a closed pipe (may happen if dumping times out)
signal(SIGPIPE, sigpipe_handler);
status_t err = service->dump(dumpPipe.writeFd().get(), mArgs);
status_t err = service->dump(write_fd.get(), this->mArgs);
if (err != OK) {
ALOGW("[%s] dump thread failed. Error: %s", this->name.string(), strerror(-err));
}
dumpPipe.writeFd().reset();
write_fd.reset();
});
// Collect dump content