| commit | 0dfce7268ef979119b7f85cfcede7fad64050c09 | [log] [tgz] |
|---|---|---|
| author | Shruti Bihani <shrutibihani@google.com> | Thu Jul 06 08:41:56 2023 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Mon Jul 17 19:35:40 2023 +0000 |
| tree | e162da1f35d5f36422982a0748814905d0105ee5 | |
| parent | 845e11c0e384d59e80f178a091d1aab4aac489c6 [diff] |
Fix Segv on unknown address error flagged by fuzzer test. The error is thrown when the destructor tries to free pointer memory. This is happening for cases where the pointer was not initialized. Initializing it to a default value fixes the error. Bug: 245135112 Test: Build mtp_host_property_fuzzer and run on the target device (cherry picked from commit 3afa6e80e8568fe63f893fa354bc79ef91d3dcc0) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9b2183ae5d234d1138e2e8667cee8f6d0a9b1726) Merged-In: I255cd68b7641e96ac47ab81479b9b46b78c15580 Change-Id: I255cd68b7641e96ac47ab81479b9b46b78c15580
diff --git a/media/mtp/MtpProperty.h b/media/mtp/MtpProperty.h index bfd5f7f..1eb8874 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;