Skip to content

Commit e659a01

Browse files
author
Juha Heiskanen
committed
Fixed compile warning for may uninitialized usage.
Change-Id: I50a59966e64a151f68ba168f30e07c457b79b3e8
1 parent bf909d2 commit e659a01

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

source/MAC/IEEE802_15_4/mac_mcps_sap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,7 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt
15431543
mac_header_information_elements_preparation(buffer);
15441544

15451545
mcps_generic_sequence_number_allocate(rf_ptr, buffer);
1546-
mlme_key_descriptor_t *key_desc;
1546+
mlme_key_descriptor_t *key_desc = NULL;
15471547
if (buffer->fcf_dsn.securityEnabled) {
15481548
bool increment_framecounter = false;
15491549
//Remember to update security counter here!
@@ -1600,7 +1600,7 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt
16001600
tr_debug("Too Long %u, %u pa %u header %u mic %u", frame_length, mac_payload_length, buffer->mac_header_length_with_security, buffer->security_mic_len, dev_driver->phy_MTU);
16011601
buffer->status = MLME_FRAME_TOO_LONG;
16021602
//decrement security counter
1603-
if (buffer->fcf_dsn.securityEnabled) {
1603+
if (key_desc) {
16041604
mac_sec_mib_key_outgoing_frame_counter_decrement(rf_ptr, key_desc);
16051605
}
16061606
return -1;
@@ -1716,7 +1716,7 @@ int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s *rf_ptr, bool in
17161716

17171717
ccm_globals_t ccm_ptr;
17181718
mac_pre_build_frame_t *buffer = &rf_ptr->enhanced_ack_buffer;
1719-
mlme_key_descriptor_t *key_desc;
1719+
mlme_key_descriptor_t *key_desc = NULL;
17201720

17211721
if (buffer->fcf_dsn.securityEnabled) {
17221722
//Remember to update security counter here!
@@ -1755,7 +1755,7 @@ int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s *rf_ptr, bool in
17551755
if ((frame_length) > ack_mtu_size - 2) {
17561756
buffer->status = MLME_FRAME_TOO_LONG;
17571757

1758-
if (buffer->fcf_dsn.securityEnabled) {
1758+
if (key_desc) {
17591759
//decrement security counter
17601760
mac_sec_mib_key_outgoing_frame_counter_decrement(rf_ptr, key_desc);
17611761
ccm_free(&ccm_ptr);

0 commit comments

Comments
 (0)