Skip to content

Commit 1c3f8af

Browse files
krutonAndroid Git Automerger
authored andcommitted
am 58b99bf: am 8263431: Merge "Reject bad ResXMLTree::setTo calls"
* commit '58b99bf1d8d203d91a63619a99a8f29911ba58bc': Reject bad ResXMLTree::setTo calls
2 parents fa87109 + 58b99bf commit 1c3f8af

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

libs/androidfw/ResourceTypes.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,6 +1209,10 @@ status_t ResXMLTree::setTo(const void* data, size_t size, bool copyData)
12091209
uninit();
12101210
mEventCode = START_DOCUMENT;
12111211

1212+
if (!data || !size) {
1213+
return (mError=BAD_TYPE);
1214+
}
1215+
12121216
if (copyData) {
12131217
mOwnedData = malloc(size);
12141218
if (mOwnedData == NULL) {

0 commit comments

Comments
 (0)