commit d45003594f2ae928869f14579095687c4f090d06
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 05 04:52:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 05 04:52:48 2016 +0000
tree a4aa7b7076eb9b34c4787bca2b17626e2f759152
parent ee1cd20c83674d1b8e37636f86165ee51f607a4a
parent b01d8f7d7853e6cd4ea1256fe3dfb2e4a79cf09a

Merge "Fix warning: Potential leak of memory pointed to by 'device'"

camera/ndk/impl/ACameraManager.cpp

diff --git a/camera/ndk/impl/ACameraManager.cpp b/camera/ndk/impl/ACameraManager.cpp
index 35555ff..1609da1 100644
--- a/camera/ndk/impl/ACameraManager.cpp
+++ b/camera/ndk/impl/ACameraManager.cpp
@@ -475,6 +475,7 @@
     sp<hardware::ICameraService> cs = CameraManagerGlobal::getInstance().getCameraService();
     if (cs == nullptr) {
         ALOGE("%s: Cannot reach camera service!", __FUNCTION__);
+        delete device;
         return ACAMERA_ERROR_CAMERA_DISCONNECTED;
     }