Merge "Fix memory leak of FileDescriptorInfo object." into main am: 35c25d3665
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2654063 Change-Id: I5b7c4189a56fd692ee86afa0f2b65037d938ad42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user