Merge tag 'android-security-13.0.0_r9' into int/13/fp3
Android security 13.0.0 release 9
* tag 'android-security-13.0.0_r9':
Fix Segv on unknown address error flagged by fuzzer test.
Change-Id: I78d856116c7ae3dab92907d1bead209cbb7b656f
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;