diff options
| author | Kenny Root <kroot@google.com> | 2012-10-12 23:46:14 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-12 23:46:14 -0700 |
| commit | 826343138dfd8666d2263dd82bfdbf657fc1881e (patch) | |
| tree | c316a098be821eed2bc471905d588af94bbb1d38 | |
| parent | cee1124052202c7f2a1956a54e5aa538d82197a7 (diff) | |
| parent | 32d6aef11abd4660fc764ffa53bd88c7589f2d35 (diff) | |
| download | base-826343138dfd8666d2263dd82bfdbf657fc1881e.tar.gz | |
Merge "Reject bad ResXMLTree::setTo calls"
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 8cce191e3e8b..79cd5bbc4dc4 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -1209,6 +1209,10 @@ status_t ResXMLTree::setTo(const void* data, size_t size, bool copyData) uninit(); mEventCode = START_DOCUMENT; + if (!data || !size) { + return (mError=BAD_TYPE); + } + if (copyData) { mOwnedData = malloc(size); if (mOwnedData == NULL) { |