diff options
author | Xin Li <delphij@google.com> | 2019-02-21 09:25:02 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2019-02-21 09:25:02 -0800 |
commit | fdc163d8632a912d23e0e13071ff1170917c857d (patch) | |
tree | 4e1fb7e22a9f2b9f6ca8e6acaa555dfbd50ec366 | |
parent | 1626f1ce8763fe5d02143bd969a6ee77da92ec51 (diff) | |
parent | f834163393db763ad5a94108a7f6f688f090098e (diff) | |
download | wlan-fdc163d8632a912d23e0e13071ff1170917c857d.tar.gz |
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-mastertemp_b_131756210_stage-aosp-master
Bug: 120848293
Change-Id: I6527fde1b13df657939153e98a994624f28b8251
-rw-r--r-- | bcmdhd/wifi_hal/gscan.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index 1ccaf30..4e4ee93 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -1197,6 +1197,7 @@ public: } } int createSetupRequest(WifiRequest& request) { + char tmp_buf[DOT11_MAX_SSID_LEN + 1]; if (epno_params.num_networks > MAX_EPNO_NETWORKS) { ALOGE("wrong epno num_networks:%d", epno_params.num_networks); return WIFI_ERROR_INVALID_ARGS; @@ -1258,14 +1259,17 @@ public: if (attr2 == NULL) { return WIFI_ERROR_OUT_OF_MEMORY; } - result = request.put(GSCAN_ATTRIBUTE_EPNO_SSID, ssid_list[i].ssid, DOT11_MAX_SSID_LEN); - ALOGI("PNO network: SSID %s flags %x auth %x", ssid_list[i].ssid, + strlcpy(tmp_buf, ssid_list[i].ssid, sizeof(tmp_buf)); + result = request.put(GSCAN_ATTRIBUTE_EPNO_SSID, tmp_buf, + strlen(tmp_buf)); + ALOGI("PNO network: SSID %s flags %x auth %x", tmp_buf, ssid_list[i].flags, ssid_list[i].auth_bit_field); if (result < 0) { return result; } - result = request.put_u32(GSCAN_ATTRIBUTE_EPNO_SSID_LEN, strlen(ssid_list[i].ssid)); + result = request.put_u32(GSCAN_ATTRIBUTE_EPNO_SSID_LEN, + strlen(tmp_buf)); if (result < 0) { return result; } |