OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2878388
)
mtp: fix double free of thumbnail data
author
Chong Zhang
<chz@google.com>
Tue, 24 Oct 2017 23:07:18 +0000
(16:07 -0700)
committer
Nikoli Cartagena
<dargeren@google.com>
Tue, 14 Nov 2017 01:29:53 +0000
(17:29 -0800)
bug:
67864232
Change-Id: I6eb51be839df12317273830521c70a4ed80f9496
(cherry picked from commit
e6b98532ee03d0ac1ca93382699893172454a946
)
media/jni/android_mtp_MtpDatabase.cpp
patch
|
blob
|
history
diff --git
a/media/jni/android_mtp_MtpDatabase.cpp
b/media/jni/android_mtp_MtpDatabase.cpp
index
7217832
..
feff102
100644
(file)
--- 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;