commit e69d9d2e7fde9dff70ba36dbc46b60bdd000cebb
author Ram Mohan <ram.mohan@ittiam.com> Fri Jun 02 17:44:45 2023 +0530
committer Dichen Zhang <dichenzhang@google.com> Tue Jun 06 01:09:23 2023 +0000
tree 394882c9c9d8c666e68a68c576cd809124a3086b
parent 05ff67be11fb137d986299ce8f8ed3abc5655e4d

ultrahdr: release memory if encode/decode fails

If calls to encode/decode failed, release the allocated memory
before returning the control to caller

Bug: 285546217
Test: ./ultrahdr_dec_fuzzer
Test: ./ultrahdr_enc_fuzzer

Change-Id: I276c31cc56656aa41845a16f5d28783bc3adc772

libs/ultrahdr/multipictureformat.cpp

diff --git a/libs/ultrahdr/multipictureformat.cpp b/libs/ultrahdr/multipictureformat.cpp
index 7a265c6..f1679ef 100644
--- a/libs/ultrahdr/multipictureformat.cpp
+++ b/libs/ultrahdr/multipictureformat.cpp
@@ -30,7 +30,7 @@
 sp<DataStruct> generateMpf(int primary_image_size, int primary_image_offset,
         int secondary_image_size, int secondary_image_offset) {
     size_t mpf_size = calculateMpfSize();
-    sp<DataStruct> dataStruct = new DataStruct(mpf_size);
+    sp<DataStruct> dataStruct = sp<DataStruct>::make(mpf_size);
 
     dataStruct->write(static_cast<const void*>(kMpfSig), sizeof(kMpfSig));
 #if USE_BIG_ENDIAN