diff options
| author | Paul Stewart <pstew@google.com> | 2016-05-31 17:31:03 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-01 16:59:09 -0700 |
| commit | 7fd42acce601dc5c51f03e022c917b93b557318a (patch) | |
| tree | 3c0a715f2c431b0f9654202e61b55c60a4b16cd0 /service/java/com/android/server/wifi/anqp/VenueNameElement.java | |
| parent | ae690a0be5959290fa6dad916dbb2076b8ff3cbf (diff) | |
| download | android_frameworks_opt_net_wifi-7fd42acce601dc5c51f03e022c917b93b557318a.tar.gz android_frameworks_opt_net_wifi-7fd42acce601dc5c51f03e022c917b93b557318a.tar.bz2 android_frameworks_opt_net_wifi-7fd42acce601dc5c51f03e022c917b93b557318a.zip | |
Deal correctly with short strings
The parseMacAddress function anticipates only properly formed
MAC addresses (6 hexadecimal octets separated by ":"). This
change properly deals with situations where the string is
shorter than expected, making sure that the passed in char*
reference in parseHexByte never exceeds the end of the string.
BUG: 28164077
TEST: Added a main function:
int main(int argc, char **argv) {
unsigned char addr[6];
if (argc > 1) {
memset(addr, 0, sizeof(addr));
parseMacAddress(argv[1], addr);
printf("Result: %02x:%02x:%02x:%02x:%02x:%02x\n",
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
}
}
Tested with "", "a" "ab" "ab:c" "abxc".
Ticket: CYNGNOS-3177
Change-Id: I0db8d0037e48b62333d475296a45b22ab0efe386
(cherry picked from commit 1921acbf2c82dd0813b3734f2609fe6f971c9c2f)
Diffstat (limited to 'service/java/com/android/server/wifi/anqp/VenueNameElement.java')
0 files changed, 0 insertions, 0 deletions