diff options
| author | Chong Zhang <chz@google.com> | 2017-10-24 16:07:18 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-29 18:08:46 +0000 |
| commit | 5f773b766d27b6766a6cebe53a32ac5d6e47843d (patch) | |
| tree | 818ca26b64a2e13c874addd876965cc66d03c7a7 | |
| parent | 0018505370e3ac0a49e03edd5cb467ee44329a35 (diff) | |
| download | base-5f773b766d27b6766a6cebe53a32ac5d6e47843d.tar.gz | |
mtp: fix double free of thumbnail data
bug: 67864232
Change-Id: I6eb51be839df12317273830521c70a4ed80f9496
(cherry picked from commit e6b98532ee03d0ac1ca93382699893172454a946)
| -rw-r--r-- | media/jni/android_mtp_MtpDatabase.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 5b874cd82678..47ec4648f125 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -951,6 +951,7 @@ void* MyMtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize) outThumbSize = image_data.thumbnail.length; } else { free(result); + result = NULL; } } break; |