commit a94cbe6fbe53460523b9e3d00c3a678bb4e7a42a
author Jayant Chowdhary <jchowdhary@google.com> Thu Apr 29 13:22:58 2021 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Thu Apr 29 13:24:30 2021 -0700
tree 9bd99e6d951ac933a4e50abb7ce03faa5996706a
parent a1335e1aa895546d2dea67a20ebec4652e81925c

CameraMetadata: avoid memory leak in case allocate_camera_metadata fails.

Bug: 186686705

Test: Native camera cts tests (basic validity)

Change-Id: I68339109d1f33facdab7ad8b689624f987cb274e
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

camera/CameraMetadata.cpp

diff --git a/camera/CameraMetadata.cpp b/camera/CameraMetadata.cpp
index 96ea5f2..a4ae71b 100644
--- a/camera/CameraMetadata.cpp
+++ b/camera/CameraMetadata.cpp
@@ -528,6 +528,8 @@
             mBuffer = allocate_camera_metadata(newEntryCount,
                     newDataCount);
             if (mBuffer == NULL) {
+                // Maintain old buffer to avoid potential memory leak.
+                mBuffer = oldBuffer;
                 ALOGE("%s: Can't allocate larger metadata buffer", __FUNCTION__);
                 return NO_MEMORY;
             }