From a627729717df3ba3ef36d4a6a6703ee007dceb07 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 20 Sep 2014 02:26:17 +0200 Subject: [PATCH] tools/sco-tester: Make sure voice setting are all zeroed first --- tools/sco-tester.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/sco-tester.c b/tools/sco-tester.c index db45ef0ef..1ad48db9b 100644 --- a/tools/sco-tester.c +++ b/tools/sco-tester.c @@ -331,8 +331,9 @@ static void test_getsockopt(const void *test_data) return; } - voice.setting = 0; len = sizeof(voice); + memset(&voice, 0, len); + err = getsockopt(sk, SOL_BLUETOOTH, BT_VOICE, &voice, &len); if (err < 0) { tester_warn("Can't get socket option : %s (%d)", @@ -368,8 +369,9 @@ static void test_setsockopt(const void *test_data) } - voice.setting = 0; len = sizeof(voice); + memset(&voice, 0, len); + err = getsockopt(sk, SOL_BLUETOOTH, BT_VOICE, &voice, &len); if (err < 0) { tester_warn("Can't get socket option : %s (%d)", @@ -384,7 +386,9 @@ static void test_setsockopt(const void *test_data) goto end; } + memset(&voice, 0, sizeof(voice)); voice.setting = BT_VOICE_TRANSPARENT; + err = setsockopt(sk, SOL_BLUETOOTH, BT_VOICE, &voice, sizeof(voice)); if (err < 0) { tester_warn("Can't set socket option : %s (%d)", @@ -393,8 +397,9 @@ static void test_setsockopt(const void *test_data) goto end; } - voice.setting = 0; len = sizeof(voice); + memset(&voice, 0, len); + err = getsockopt(sk, SOL_BLUETOOTH, BT_VOICE, &voice, &len); if (err < 0) { tester_warn("Can't get socket option : %s (%d)", @@ -549,7 +554,9 @@ static void test_connect_transp(const void *test_data) return; } + memset(&voice, 0, sizeof(voice)); voice.setting = BT_VOICE_TRANSPARENT; + err = setsockopt(sk, SOL_BLUETOOTH, BT_VOICE, &voice, sizeof(voice)); if (err < 0) { tester_warn("Can't set socket option : %s (%d)", -- 2.47.3