| commit | 396487f5aaf71d9de6c346dc4996c53bb2ea7685 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Mon Oct 30 23:16:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 30 23:16:40 2017 +0000 |
| tree | 5b0d4b342f492ed8ec68917d6511cbf9620005f7 | |
| parent | 34e4628cfbfd78d9314c9b80dd28cbc92d6efba8 [diff] | |
| parent | f9e16c9899001a92a487233422e2b8888d5caeb9 [diff] |
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 Change-Id: Id780ff2bfb2f3881cbf33032971ed3b397a2fcde
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;