commit 2cbbe5ffb511337b815f83aa8d3e6a29907cd4de
author Adam Buchbinder <abuchbinder@google.com> Fri May 20 14:49:51 2016 -0700
committer Adam Buchbinder <abuchbinder@google.com> Fri May 20 15:02:28 2016 -0700
tree 582fb97564224655411ebca7f3c815cc850a7fcd
parent 2ec03788f14bfc5768f582ab2a4bc0bc04a3f66c

Fix memory-handling issues in EmulatedFakeCameras under goldfish/.

This fixes the following cppcheck reports:
[device/generic/goldfish/camera/EmulatedFakeCamera2.cpp:1121]: (error)
  Mismatching allocation and deallocation: ReadoutThread::mInFlightQueue
[device/generic/goldfish/camera/EmulatedFakeCamera3.cpp:928]: (error)
  Memory leak: sensorBuffers
[device/generic/goldfish/camera/EmulatedFakeCamera3.cpp:928]: (error)
  Memory leak: buffers

Change-Id: Iad49d0a4760fcddbe73f25b2504331e8f2a690ae

camera/EmulatedFakeCamera2.cpp

diff --git a/camera/EmulatedFakeCamera2.cpp b/camera/EmulatedFakeCamera2.cpp
index d1beb92..ed29c5d 100644
--- a/camera/EmulatedFakeCamera2.cpp
+++ b/camera/EmulatedFakeCamera2.cpp
@@ -1118,7 +1118,7 @@
 }
 
 EmulatedFakeCamera2::ReadoutThread::~ReadoutThread() {
-    delete mInFlightQueue;
+    delete[] mInFlightQueue;
 }
 
 status_t EmulatedFakeCamera2::ReadoutThread::readyToRun() {

camera/EmulatedFakeCamera3.cpp

diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index a8d509c..0e305f9 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -925,6 +925,8 @@
                 GraphicBufferMapper::get().unlock(
                         *(request->output_buffers[i].buffer));
             }
+            delete sensorBuffers;
+            delete buffers;
             return NO_INIT;
         }