Camera: Fix jpeg auxiliary buffer leak
During Jpeg compression 'mFoundAux' will
get shadowed and the corresponding member
variable will never get correctly initialized.
Depending on the stack state the arbitrary
value in 'mFoundAux' will cause leaks of the
auxiliary jpeg buffer.
Bug: 131697512
Test: atest
cts/tests/camera/src/android/hardware/camera2/cts/FastBasicsTest.java
--generate-baseline=100
Change-Id: If8be5612487b05dadfd89aabb26c099728251075
diff --git a/guest/hals/camera/fake-pipeline2/JpegCompressor.cpp b/guest/hals/camera/fake-pipeline2/JpegCompressor.cpp
index 7fb6cf1..22c5d3a 100644
--- a/guest/hals/camera/fake-pipeline2/JpegCompressor.cpp
+++ b/guest/hals/camera/fake-pipeline2/JpegCompressor.cpp
@@ -30,7 +30,8 @@
mIsBusy(false),
mSynchronous(false),
mBuffers(NULL),
- mListener(NULL) {}
+ mListener(NULL),
+ mFoundAux(false) {}
JpegCompressor::~JpegCompressor() { Mutex::Autolock lock(mMutex); }
@@ -121,7 +122,6 @@
// Find source and target buffers. Assumes only one buffer matches
// each condition!
ALOGV("%s: Compressing start", __FUNCTION__);
- bool mFoundAux = false;
for (size_t i = 0; i < mBuffers->size(); i++) {
const StreamBuffer &b = (*mBuffers)[i];
if (b.format == HAL_PIXEL_FORMAT_BLOB) {
