commit 7f63b9a92b2fa44b8f1fa4523300e1f3a4c32e4f
author Narayan Kamath <narayan@google.com> Thu Apr 20 14:32:12 2017 +0100
committer Narayan Kamath <narayan@google.com> Tue Apr 25 08:53:09 2017 +0000
tree db4ece7b2e03c998cbfa81312011b1d3ad2883de
parent 5c5b6daecaeb4ea53e0cd16102cd3a5d7b8b22b9

CameraMetadataNative: Fix FD leak in dump.

Always close the read end of the socketpair. In addition, return
early if pthread_create fails. If we don't do this, we risk blocking
forever on the read() and/or calling pthread_join on an undefined
pthread_t.

Test: run cts -m CtsCameraTestCases;

Change-Id: I9adb872ac2dbca2474e04707b77945b0a08d9432

core/jni/android_hardware_camera2_CameraMetadata.cpp

diff --git a/core/jni/android_hardware_camera2_CameraMetadata.cpp b/core/jni/android_hardware_camera2_CameraMetadata.cpp
index c11ce0f..d8eb7d2 100644
--- a/core/jni/android_hardware_camera2_CameraMetadata.cpp
+++ b/core/jni/android_hardware_camera2_CameraMetadata.cpp
@@ -442,10 +442,12 @@
 
         if (threadRet != 0) {
             close(writeFd);
+            close(readFd);
 
             jniThrowExceptionFmt(env, "java/io/IOException",
                     "Failed to create thread for writing (errno = %#x, message = '%s')",
                     threadRet, strerror(threadRet));
+            return;
         }
     }
 
@@ -476,6 +478,8 @@
         } else if (!logLine.isEmpty()) {
             ALOGD("%s", logLine.string());
         }
+
+        close(readFd);
     }
 
     int res;