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

2017-10-30 22:46:40 +00:00
parent 73a4e88df8 e6b98532ee
commit 914bc14e82
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;