commit b18cfd46d943d77b8d17e8d76a67c23f7ca1c071
author Jayant Chowdhary <jchowdhary@google.com> Tue May 04 23:04:25 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 04 23:04:25 2021 +0000
tree b78a3513e5170ac5a8f3e251441ecb3484e0cc7d
parent 9a8a479a73afa397c0dc387b99ca2a427fdab669
parent a94cbe6fbe53460523b9e3d00c3a678bb4e7a42a

Merge "CameraMetadata: avoid memory leak in case allocate_camera_metadata fails." into sc-dev

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;
             }