commit 4dce57e459b695855a23b25312ec5b9e6fd6026f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 16 17:05:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 16 17:05:08 2018 +0000
tree ef8b7b193766306321f79a7ac2e1d0c02873f045
parent bcb0c1b49ab75e5fe9d0713ed2c880200f89a725
parent 06ced051d9cc2c8aac6b1ef41a056904600c69d8

Merge "Avoid segfaults if disconnect USB camera while preview."

camera/device/3.4/default/ExternalCameraDeviceSession.cpp

diff --git a/camera/device/3.4/default/ExternalCameraDeviceSession.cpp b/camera/device/3.4/default/ExternalCameraDeviceSession.cpp
index 28ca0f3..1b73914 100644
--- a/camera/device/3.4/default/ExternalCameraDeviceSession.cpp
+++ b/camera/device/3.4/default/ExternalCameraDeviceSession.cpp
@@ -1737,7 +1737,11 @@
     // TODO: see if we can save some computation by converting to YV12 here
     uint8_t* inData;
     size_t inDataSize;
-    req->frameIn->map(&inData, &inDataSize);
+    if (req->frameIn->map(&inData, &inDataSize) != 0) {
+        lk.unlock();
+        return onDeviceError("%s: V4L2 buffer map failed", __FUNCTION__);
+    }
+
     // TODO: in some special case maybe we can decode jpg directly to gralloc output?
     ATRACE_BEGIN("MJPGtoI420");
     int res = libyuv::MJPGToI420(