diff options
| author | Ningyuan Wang <nywang@google.com> | 2016-10-11 20:55:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-11 20:55:31 +0000 |
| commit | 2a9a3a9304640c7000d0ce1c1659ae9fade08b36 (patch) | |
| tree | 7768c740a7b5f94dcb2e063ff729deb10cb0f08c | |
| parent | 2709be1ecb0062e301dc2d3ea9eef11951a5b958 (diff) | |
| parent | 8851f93e19f13516f20eab29ae685911fc9b390d (diff) | |
| download | wifi-2a9a3a9304640c7000d0ce1c1659ae9fade08b36.tar.gz | |
resolve merge conflicts of 849c5c7 to mnc-dev am: 29a2baf319 am: 583dc0e86d am: e61906f92c
am: 8851f93e19
Change-Id: I9ff8deb5f9eda801c10e1ec5d4a777db4390aae6
| -rw-r--r-- | service/jni/com_android_server_wifi_WifiNative.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp index a8da6aa6e..462defd8d 100644 --- a/service/jni/com_android_server_wifi_WifiNative.cpp +++ b/service/jni/com_android_server_wifi_WifiNative.cpp @@ -787,6 +787,13 @@ static jboolean android_net_wifi_setHotlist( return false; } + if (params.num_bssid > + static_cast<int>(sizeof(params.ap) / sizeof(params.ap[0]))) { + ALOGE("setHotlist array length is too long"); + android_errorWriteLog(0x534e4554, "31856351"); + return false; + } + for (int i = 0; i < params.num_bssid; i++) { JNIObject<jobject> objAp = helper.getObjectArrayElement(array, i); |