@@ -1543,7 +1543,7 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt
1543
1543
mac_header_information_elements_preparation (buffer );
1544
1544
1545
1545
mcps_generic_sequence_number_allocate (rf_ptr , buffer );
1546
- mlme_key_descriptor_t * key_desc ;
1546
+ mlme_key_descriptor_t * key_desc = NULL ;
1547
1547
if (buffer -> fcf_dsn .securityEnabled ) {
1548
1548
bool increment_framecounter = false;
1549
1549
//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
1600
1600
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 );
1601
1601
buffer -> status = MLME_FRAME_TOO_LONG ;
1602
1602
//decrement security counter
1603
- if (buffer -> fcf_dsn . securityEnabled ) {
1603
+ if (key_desc ) {
1604
1604
mac_sec_mib_key_outgoing_frame_counter_decrement (rf_ptr , key_desc );
1605
1605
}
1606
1606
return -1 ;
@@ -1716,7 +1716,7 @@ int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s *rf_ptr, bool in
1716
1716
1717
1717
ccm_globals_t ccm_ptr ;
1718
1718
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 ;
1720
1720
1721
1721
if (buffer -> fcf_dsn .securityEnabled ) {
1722
1722
//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
1755
1755
if ((frame_length ) > ack_mtu_size - 2 ) {
1756
1756
buffer -> status = MLME_FRAME_TOO_LONG ;
1757
1757
1758
- if (buffer -> fcf_dsn . securityEnabled ) {
1758
+ if (key_desc ) {
1759
1759
//decrement security counter
1760
1760
mac_sec_mib_key_outgoing_frame_counter_decrement (rf_ptr , key_desc );
1761
1761
ccm_free (& ccm_ptr );
0 commit comments