diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-16 18:33:40 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-16 18:33:40 +0000 |
| commit | da07794fbb26282a5ead1cfa91b74b6afd3311e8 (patch) | |
| tree | 6172d689aaaf12f593a4675d872894d78db8016b | |
| parent | 64b90636241aa48d0b720d86552e491e4f2cd089 (diff) | |
| parent | b262c7372657be63ec81b1ecd6bc06773e3eda32 (diff) | |
| download | wpa_supplicant_8-android-11.0.0_r30.tar.gz | |
Merge cherrypicks of [13237717, 13237455, 13237456, 13237585, 13237718, 13237719, 13237720, 13237725, 13238104, 13237746, 13237586, 13237478, 13237479, 13237691, 13238124, 13238105, 13237747, 13237748, 13237749, 13237750, 13237751, 13238125, 13237587, 13237726, 13238126, 13238127, 13237727, 13237728, 13237729, 13237721, 13237588, 13238106, 13238107, 13237722, 13237723, 13238144, 13238145, 13238146, 13238147, 13238148, 13237589, 13237590, 13237591, 13237692, 13237693, 13238128, 13238129, 13238149, 13238150, 13237592, 13237593, 13237594, 13237595, 13237730, 13237731, 13238151, 13236939, 13236940, 13238130, 13238131, 13236759, 13236761, 13237752, 13237753, 13237754, 13238132, 13238133, 13238134] into rvc-qpr1-c-releaseandroid-11.0.0_r30android11-qpr1-c-release
Change-Id: I0c768b2d92b788f7c85fcd10097e2d03415ee819
| -rw-r--r-- | src/p2p/p2p.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 9c738850..1dc5b92a 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -8,6 +8,7 @@ #include "includes.h" +#include <log/log.h> #include "common.h" #include "eloop.h" #include "common/defs.h" @@ -453,6 +454,10 @@ static void p2p_copy_client_info(struct p2p_device *dev, dev->info.config_methods = cli->config_methods; os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types; + if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) { + android_errorWriteLog(0x534e4554, "172937525"); + dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN; + } os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types, dev->info.wps_sec_dev_type_list_len); } |