Merge "Reject bad ResXMLTree::setTo calls"

2012-10-12 23:46:14 -07:00
parent cee1124052 32d6aef11a
commit 826343138d
1 changed files with 4 additions and 0 deletions
--- 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) {