commit | f117b1c7662fd7023f36ef7dfe9e55bf1fb7f755 | [log] [tgz] |
---|---|---|
author | Chong Zhang <chz@google.com> | Tue Oct 24 16:07:18 2017 -0700 |
committer | Nikoli Cartagena <dargeren@google.com> | Tue Nov 28 21:35:47 2017 -0800 |
tree | 730e28aa47c7d5f122f1d0645d18d08c8ada25b6 | |
parent | f02f1304703f7e9417cc0d7342035f83d05e03d9 [diff] |
mtp: fix double free of thumbnail data bug: 67864232 Change-Id: I6eb51be839df12317273830521c70a4ed80f9496 (cherry picked from commit e6b98532ee03d0ac1ca93382699893172454a946)
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 5b874cd..47ec464 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -951,6 +951,7 @@ outThumbSize = image_data.thumbnail.length; } else { free(result); + result = NULL; } } break;