Skip to content

Commit 4e2a743

Browse files
Juha Heiskanenjuhhei01
authored andcommitted
Fixed thread test some of.
Change-Id: I102ddefa9a485680baee90a29110106a08c419cb
1 parent 2680dd6 commit 4e2a743

File tree

2 files changed

+35
-7
lines changed

2 files changed

+35
-7
lines changed

test/nanostack/unittest/thread/nvm/test_thread_nvm_store.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,8 @@ bool test_thread_nvm_store_device_data()
318318
ns_file_system_set_root_path(ROOT_FILE_PATH);
319319
uint8_t mac[8];
320320
uint8_t mle_id[8];
321+
memset(mle_id, 0, 8);
322+
memset(mac, 0, 8);
321323
mac[0] = 7;
322324
mac[7] = 17;
323325
mle_id[0] = 2;
@@ -329,6 +331,8 @@ bool test_thread_nvm_store_device_data()
329331

330332
uint8_t mac_read[8];
331333
uint8_t mle_id_read[8];
334+
memset(mac_read, 0, 8);
335+
memset(mle_id_read, 0, 8);
332336

333337
ret = thread_nvm_store_device_configuration_read(mac_read, mle_id_read);
334338
ns_file_system_set_root_path(NULL);

test/nanostack/unittest/thread/thread_commissioning_api/test_thread_commissioning_api.c

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,19 @@ bool test_thread_commissioning_petition_start()
137137
{
138138
int8_t interface_id = 6;
139139
int status_cb_ptr = 1;
140-
char commissioner_id_ptr[1];
140+
141+
char commissioner_id_ptr[2];
142+
memset(commissioner_id_ptr, 0, 2);
141143
commissioner_id_ptr[0] = 'a';
142-
char commissioner_id_ptr_long[65];
144+
char commissioner_id_ptr_long[66];
145+
memset(commissioner_id_ptr_long, 0, 66);
143146

144147
if ( -1 != thread_commissioning_petition_start(interface_id,commissioner_id_ptr, &status_cb_ptr))
145148
return false;
146149
nsdynmemlib_stub.returnCounter = 1;
147150
/*now register a commissioner */
148151
uint8_t pw[16];
152+
memset(pw, 0, 16);
149153
if( 0 != thread_commissioning_register(interface_id, pw) )
150154
return false;
151155
if ( -2 != thread_commissioning_petition_start(interface_id,NULL,&status_cb_ptr))
@@ -184,17 +188,21 @@ bool test_thread_commissioning_rx_receive_cb()
184188

185189

186190
int status_cb_ptr = 1;
187-
char commissioner_id_ptr[1];
191+
char commissioner_id_ptr[2];
192+
commissioner_id_ptr[1] = 0;
188193
commissioner_id_ptr[0] = 'a';
189194
uint8_t data_ptr[3];
195+
memset(data_ptr, 0, 3);
190196
int8_t service_id = 0;
191197
uint8_t source_address[] = {0xfe,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf,0xff};
192198
uint16_t source_port = 1;
193199
uint8_t payload[] = {0x11,0x12,0x13,0x16,0x01};
194200
sn_coap_hdr_s response_ptr;
201+
memset(&response_ptr, 0, sizeof(sn_coap_hdr_s));
195202
response_ptr.payload_ptr = payload;
196203
response_ptr.payload_len = 5;
197204
sn_coap_hdr_s request_ptr;
205+
memset(&request_ptr, 0, sizeof(sn_coap_hdr_s));
198206
request_ptr.payload_ptr = payload;
199207
request_ptr.payload_len = 5;
200208
nsdynmemlib_stub.returnCounter = 4;
@@ -259,17 +267,21 @@ bool test_thread_commissioning_application_provision_cb()
259267

260268

261269
int status_cb_ptr = 1;
262-
char commissioner_id_ptr[1];
270+
char commissioner_id_ptr[2];
271+
commissioner_id_ptr[1] = 0;
263272
commissioner_id_ptr[0] = 'a';
264273
uint8_t data_ptr[3];
274+
memset(data_ptr, 0, 3);
265275
int8_t service_id = 0;
266276
uint8_t source_address[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
267277
uint16_t source_port = 1;
268278
uint8_t payload[] = {0x11,0x12,0x13,0x16,0x01};
269279
sn_coap_hdr_s response_ptr;
280+
memset(&response_ptr, 0, sizeof(sn_coap_hdr_s));
270281
response_ptr.payload_ptr = payload;
271282
response_ptr.payload_len = 5;
272283
sn_coap_hdr_s request_ptr;
284+
memset(&request_ptr, 0, sizeof(sn_coap_hdr_s));
273285
request_ptr.payload_ptr = payload;
274286
request_ptr.payload_len = 5;
275287
nsdynmemlib_stub.returnCounter = 4;
@@ -335,17 +347,21 @@ bool test_thread_commissioning_finalisation_req_recv_cb()
335347

336348

337349
int status_cb_ptr = 1;
338-
char commissioner_id_ptr[1];
350+
char commissioner_id_ptr[2];
351+
commissioner_id_ptr[1] = 0;
339352
commissioner_id_ptr[0] = 'a';
340353
uint8_t data_ptr[3];
354+
memset(data_ptr, 0, 3);
341355
int8_t service_id = 0;
342356
uint8_t source_address[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
343357
uint16_t source_port = 1;
344358
uint8_t payload[] = {0x11,0x12,0x13,0x16,0x01};
345359
sn_coap_hdr_s response_ptr;
360+
memset(&response_ptr, 0, sizeof(sn_coap_hdr_s));
346361
response_ptr.payload_ptr = payload;
347362
response_ptr.payload_len = 5;
348363
sn_coap_hdr_s request_ptr;
364+
memset(&request_ptr, 0, sizeof(sn_coap_hdr_s));
349365
request_ptr.payload_ptr = payload;
350366
request_ptr.payload_len = 5;
351367
nsdynmemlib_stub.returnCounter = 4;
@@ -396,13 +412,15 @@ bool test_thread_commissioning_petition_keep_alive()
396412

397413
int8_t interface_id = 7;
398414
commissioning_state_e state = COMMISSIONING_STATE_ACCEPT;
399-
char commissioner_id_ptr[1];
415+
char commissioner_id_ptr[2];
400416
int status_cb_ptr = 1;
417+
commissioner_id_ptr[1] = 0;
401418
commissioner_id_ptr[0] = 'a';
402419
if (-1 != thread_commissioning_petition_keep_alive(interface_id, state))
403420
return false;
404421
nsdynmemlib_stub.returnCounter = 1;
405422
uint8_t pw[16];
423+
memset(pw, 0, 16);
406424
/*now register a commissioner */
407425
if( 0 != thread_commissioning_register(interface_id, pw) )
408426
return false;
@@ -427,6 +445,7 @@ bool test_thread_commissioning_get_management_id()
427445

428446
nsdynmemlib_stub.returnCounter = 1;
429447
uint8_t pw[16];
448+
memset(pw, 0, 16);
430449
/*now register a commissioner */
431450
if( 0 != thread_commissioning_register(interface_id, pw) )
432451
return false;
@@ -444,7 +463,9 @@ bool test_thread_commissioning_native_commissioner_start()
444463
{
445464
int8_t interface_id = 1;
446465
protocol_interface_info_entry_t cur;
466+
memset(&cur, 0, sizeof(protocol_interface_info_entry_t));
447467
thread_info_t thread_info;
468+
memset(&thread_info, 0, sizeof(thread_info_t));
448469
thread_info.version = 1;
449470
cur.id = interface_id;
450471
cur.thread_info = NULL;
@@ -464,14 +485,17 @@ bool test_thread_commissioning_native_commissioner_start()
464485
bool test_thread_commissioning_native_commissioner_connect()
465486
{
466487
thread_commissioning_link_configuration_s link_configuration;
488+
memset(&link_configuration, 0, sizeof(thread_commissioning_link_configuration_s));
467489
int8_t interface_id = 1;
468490
protocol_interface_info_entry_t cur;
491+
memset(&cur, 0, sizeof(protocol_interface_info_entry_t));
469492
thread_info_t thread_info;
493+
memset(&thread_info, 0, sizeof(thread_info_t));
470494
thread_info.version = 1;
471495
thread_info.thread_attached_state = THREAD_STATE_CONNECTED;
472496
thread_info.native_commissioner_port = 10;
473497
uint8_t address_ptr;
474-
uint16_t port;
498+
uint16_t port = 1;
475499
cur.id = interface_id;
476500
cur.thread_info = NULL;
477501
protocol_core_stub.entry_ptr = NULL;

0 commit comments

Comments
 (0)