commit 914bc14e82c3166059b58e8c58c46ba0512d211b
author Chong Zhang <chz@google.com> Mon Oct 30 22:46:40 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 30 22:46:40 2017 +0000
tree 0bbce1d281ca93fdd42d5db9fe18e4105bea460c
parent 73a4e88df80d11360c41f3f7f9ae89294eeb14bf
parent e6b98532ee03d0ac1ca93382699893172454a946

Merge "mtp: fix double free of thumbnail data" into nyc-dev

media/jni/android_mtp_MtpDatabase.cpp

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;