Merge "Fix memory leak of FileDescriptorInfo object." into main am: 35c25d3665 am: 42ac4be27a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2654063

Change-Id: I2da16d3798bf84686e20b5c14ee51779e3510c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-07-13 16:05:21 +00:00
committed by Automerger Merge Worker

View File

@@ -580,6 +580,7 @@ void FileDescriptorTable::RestatInternal(std::set<int>& open_fds, fail_fn_t fail
// TODO(narayan): This will be an error in a future android release. // TODO(narayan): This will be an error in a future android release.
// error = true; // error = true;
// ALOGW("Zygote closed file descriptor %d.", it->first); // ALOGW("Zygote closed file descriptor %d.", it->first);
delete it->second;
it = open_fd_map_.erase(it); it = open_fd_map_.erase(it);
} else { } else {
// The entry from the file descriptor table is still open. Restat // The entry from the file descriptor table is still open. Restat