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

am: db258ebba8 Change-Id: Ic9821f05d30a57fad1567e834804cec6ff5dca97
2017-10-31 00:11:32 +00:00
parent 44cd5b97ad db258ebba8
commit e3ac25eb0c
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;