diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-13 14:01:31 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-13 14:01:31 -0700 |
commit | 500ed30d27b12d0c633157ec8c81cd2c26c46f0a (patch) | |
tree | b3f063a2db0b7e41af07b705f8dac4830d2fb11e | |
parent | 43b4a37fc28ddbbfd44df96ae9af85096639d17a (diff) | |
parent | df369a168dfc5dbcd23fd38004c3f9e5838a0d18 (diff) | |
download | android_hardware_broadcom_wlan-500ed30d27b12d0c633157ec8c81cd2c26c46f0a.tar.gz android_hardware_broadcom_wlan-500ed30d27b12d0c633157ec8c81cd2c26c46f0a.tar.bz2 android_hardware_broadcom_wlan-500ed30d27b12d0c633157ec8c81cd2c26c46f0a.zip |
Snap for 5450365 from f632b64f225162de0c7e8dee5953d44bbfcf353f to pi-platform-release
am: df369a168d
Change-Id: Ifbfdc4c6ff8b5f110825493b2650db8d39722c1c
-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; } |