commit b1c406293790fa9a393793daa04c91edf735d0ea
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 14 17:33:34 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 14 17:33:34 2023 +0000
tree 7766b3b3822f6536c7d6c7982405c81f4317ec59
parent 6ede7caa4fdd91e32d29a45140cd4f13d2e37d30
parent 9f042d16d4d51b0a87a0a89c78c2e2a9a7e3b544

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914016'] into security-aosp-sc-release.

Change-Id: I47e19681c9ac7e5ebc5bb2facd9e52a356349804

media/mtp/MtpProperty.h

diff --git a/media/mtp/MtpProperty.h b/media/mtp/MtpProperty.h
index 36d7360..2bdbfd3 100644
--- a/media/mtp/MtpProperty.h
+++ b/media/mtp/MtpProperty.h
@@ -26,6 +26,9 @@
 class MtpDataPacket;
 
 struct MtpPropertyValue {
+    // pointer str initialized to NULL so that free operation
+    // is not called for pre-assigned value
+    MtpPropertyValue() : str (NULL) {}
     union {
         int8_t          i8;
         uint8_t         u8;