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

am: 5330335288 Change-Id: Ic7b7f250073c4c89ac853036516bcade6b875092
2017-10-30 23:48:44 +00:00
parent af70ac2914 5330335288
commit db258ebba8
1 changed files with 1 additions and 0 deletions
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -948,6 +948,7 @@ void* MyMtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize)
                        outThumbSize = image_data.thumbnail.length;
                    } else {
                        free(result);
+                        result = NULL;
                    }
                }
                break;