summaryrefslogtreecommitdiffstats
path: root/include/androidfw
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-04-15 00:07:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-15 00:07:01 +0000
commit39606e9f78a1b2aa4e82b47e978471cd1158d1df (patch)
tree3e21c499055b91d18693283d095113c82e2a0c42 /include/androidfw
parent4c08b1bab279fec1a66f1af701ee5c2054eba9ac (diff)
parent7b09e7a9f3ef804e9cd159023b64eac1ef8b7931 (diff)
downloadframeworks_base-39606e9f78a1b2aa4e82b47e978471cd1158d1df.zip
frameworks_base-39606e9f78a1b2aa4e82b47e978471cd1158d1df.tar.gz
frameworks_base-39606e9f78a1b2aa4e82b47e978471cd1158d1df.tar.bz2
am 7b09e7a9: am 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt."
* commit '7b09e7a9f3ef804e9cd159023b64eac1ef8b7931': Fix UB in ResourceTable::stringToInt.
Diffstat (limited to 'include/androidfw')
-rw-r--r--include/androidfw/ResourceTypes.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index da70e9b..df278c8 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -372,7 +372,8 @@ struct Res_value
};
// The data for this item, as interpreted according to dataType.
- uint32_t data;
+ typedef uint32_t data_type;
+ data_type data;
void copyFrom_dtoh(const Res_value& src);
};
@@ -1512,6 +1513,8 @@ private:
KeyedVector<String16, uint8_t> mEntries;
};
+bool U16StringToInt(const char16_t* s, size_t len, Res_value* outValue);
+
/**
* Convenience class for accessing data in a ResTable resource.
*/