commit 5bccde719f9586b3c18ab2ef1eee5ca81e2cc9ac
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 17 04:16:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 17 04:16:43 2019 +0000
tree 78ce555c6dc7cb920f5e7c9f21fbcc6e40df4f50
parent 05ca47512c94d919ba72862920985992a5ed2905
parent de853ffa7fd84e3e2b27ef9cc546d4d4ba300488

Merge "Fix fd leak in android_dlopen_ext."

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 1f259e1..c5701dd 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -601,6 +601,9 @@
   }
 
   void set_fd(int fd, bool assume_ownership) {
+    if (fd_ != -1 && close_fd_) {
+      close(fd_);
+    }
     fd_ = fd;
     close_fd_ = assume_ownership;
   }