diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-14 23:25:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-14 23:25:27 +0000 |
| commit | 571c5a26f767f67118f34ca0d426aeeb4a287b2c (patch) | |
| tree | c6019f3417f18d7b7c80342aae5f78cfd649ca80 /include | |
| parent | d693690aee3ee94878ab59ee86d8db8ce5bb3789 (diff) | |
| parent | 1b4f316651096f0ef9301b4ffde4816a08a54ab5 (diff) | |
| download | frameworks_base-571c5a26f767f67118f34ca0d426aeeb4a287b2c.zip frameworks_base-571c5a26f767f67118f34ca0d426aeeb4a287b2c.tar.gz frameworks_base-571c5a26f767f67118f34ca0d426aeeb4a287b2c.tar.bz2 | |
Merge "Fix UB in ResourceTable::stringToInt."
Diffstat (limited to 'include')
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 0822afd..8de0138 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); }; @@ -1502,6 +1503,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. */ |