diff options
author | Paul Stewart <pstew@google.com> | 2016-06-07 22:10:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 22:10:32 +0000 |
commit | 0f37e416a42451deeaf0bbe7bfca8232d050f39e (patch) | |
tree | d2bacd4ff37fd2fdf62185747cffb1cec8d5c65c /service/jni | |
parent | dcf7577b0243059412c5508c79cbbbf6734cb555 (diff) | |
parent | 444e06c4690f438672491641ac3198adc690e98c (diff) | |
download | android_frameworks_opt_net_wifi-0f37e416a42451deeaf0bbe7bfca8232d050f39e.tar.gz android_frameworks_opt_net_wifi-0f37e416a42451deeaf0bbe7bfca8232d050f39e.tar.bz2 android_frameworks_opt_net_wifi-0f37e416a42451deeaf0bbe7bfca8232d050f39e.zip |
Deal correctly with short strings am: 1921acbf2c am: 49fefde164
am: 444e06c469
Change-Id: Ied4ebd36b8e373b830d61869723caa3e8eeb32c3
Diffstat (limited to 'service/jni')
-rw-r--r-- | service/jni/com_android_server_wifi_WifiNative.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp index c14fa8dbd..0a1b36f84 100644 --- a/service/jni/com_android_server_wifi_WifiNative.cpp +++ b/service/jni/com_android_server_wifi_WifiNative.cpp @@ -510,15 +510,23 @@ static byte parseHexChar(char ch) { } static byte parseHexByte(const char * &str) { + if (str[0] == '\0') { + ALOGE("Passed an empty string"); + return 0; + } byte b = parseHexChar(str[0]); - if (str[1] == ':' || str[1] == '\0') { - str += 2; - return b; + if (str[1] == '\0' || str[1] == ':') { + str ++; } else { b = b << 4 | parseHexChar(str[1]); - str += 3; - return b; + str += 2; + } + + // Skip trailing delimiter if not at the end of the string. + if (str[0] != '\0') { + str++; } + return b; } static void parseMacAddress(const char *str, mac_addr addr) { |