diff options
| author | Kenny Root <kroot@google.com> | 2012-10-12 23:57:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-12 23:57:38 -0700 |
| commit | 58b99bf1d8d203d91a63619a99a8f29911ba58bc (patch) | |
| tree | a2f598ab16c769364f1497a5b7426822e0fa002f /libs | |
| parent | 75cf582c028ffe179521825a1908cd747f190a33 (diff) | |
| parent | 826343138dfd8666d2263dd82bfdbf657fc1881e (diff) | |
| download | frameworks_base-58b99bf1d8d203d91a63619a99a8f29911ba58bc.zip frameworks_base-58b99bf1d8d203d91a63619a99a8f29911ba58bc.tar.gz frameworks_base-58b99bf1d8d203d91a63619a99a8f29911ba58bc.tar.bz2 | |
am 82634313: Merge "Reject bad ResXMLTree::setTo calls"
* commit '826343138dfd8666d2263dd82bfdbf657fc1881e':
Reject bad ResXMLTree::setTo calls
Diffstat (limited to 'libs')
| -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 0107da4..46ac886 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) { |