commit 03d055d6ff38993c04fcc3ec24becda35b119a52
author Josh Gao <jmgao@google.com> Wed Oct 18 15:42:00 2017 -0700
committer Josh Gao <jmgao@google.com> Thu Oct 19 13:19:19 2017 -0700
tree 8e87b43fe34bbaa5899086119a21e6d5dcc73478
parent d72d92aee2d125f6a8d26932e6482bea5398b92c

liblogcat: avoid double close.

Bug: http://b/67960705
Test: mma
Change-Id: I0b9015f0b4e64631a3476966decce3b6210bb801

logcat/logcat_system.cpp

diff --git a/logcat/logcat_system.cpp b/logcat/logcat_system.cpp
index ea393bd..6dfd110 100644
--- a/logcat/logcat_system.cpp
+++ b/logcat/logcat_system.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -98,8 +99,12 @@
         return NULL;
     }
 
-    FILE* retval = fdopen(fd, "reb");
-    if (!retval) android_logcat_destroy(ctx);
+    int duped = dup(fd);
+    FILE* retval = fdopen(duped, "reb");
+    if (!retval) {
+        close(duped);
+        android_logcat_destroy(ctx);
+    }
     return retval;
 }