diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-02 04:06:15 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-02 04:06:15 +0000 |
commit | 56500087eb1cbaf8ccdf0083c80c7f54eeff6770 (patch) | |
tree | 83fb6fbdf23a705989866fc38b5845eeda577198 | |
parent | f37578b27a315e72ffbe04a4521091cd0d85bf5b (diff) | |
parent | 73309d2a374191f0fe1382c20439f338d563f590 (diff) | |
download | wlan-56500087eb1cbaf8ccdf0083c80c7f54eeff6770.tar.gz |
Snap for 5158715 from 73309d2a374191f0fe1382c20439f338d563f590 to qt-release
Change-Id: Ic5d64ac7f442b6a3cfd54ab7afbb33d6dbba3b03
-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; } |