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

am: f9e16c9899 Change-Id: Id780ff2bfb2f3881cbf33032971ed3b397a2fcde
2017-10-30 23:16:40 +00:00
parent 34e4628cfb f9e16c9899
commit 396487f5aa
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;