Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8

am: e3ac25eb0c Change-Id: Iba4bcd510ea20aa6fe928074912a864fe325680a
2017-10-31 00:26:33 +00:00
parent 37082aa53e e3ac25eb0c
commit bd7101937a
1 changed files with 1 additions and 0 deletions
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -949,6 +949,7 @@ void* MyMtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize)
                        outThumbSize = image_data.thumbnail.length;
                    } else {
                        free(result);
+                        result = NULL;
                    }
                }
                break;