| commit | 5330335288d351d8df08f45d3cc74c7c7cba04b3 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Mon Oct 30 23:33:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 30 23:33:04 2017 +0000 |
| tree | cd13d750ced764bb4d2094fc29cb0d80b7f7aa34 | |
| parent | 76d9732106e89aa3539e583f95641fcd54bb300d [diff] | |
| parent | 396487f5aaf71d9de6c346dc4996c53bb2ea7685 [diff] |
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa Change-Id: Idf1ec8982316d3cef253609c702435a21d8f2eed
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 7217832..feff102 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -948,6 +948,7 @@ outThumbSize = image_data.thumbnail.length; } else { free(result); + result = NULL; } } break;