Spiri
/
services-ros1-xbee_mav
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for malloc error

This commit is contained in:
vivek-shankar 2017-01-29 14:12:39 -05:00
parent 5d5d1f946d
commit 94183d9ac8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CommunicationManager.cpp
View File

@ -687,7 +687,7 @@ inline void CommunicationManager::Send_Mavlink_Message_Callback(
uint64_t message_obt[mavlink_msg->payload64.size()]; uint64_t message_obt[mavlink_msg->payload64.size()];
/*buffer for easy handel operation*/ /*buffer for easy handel operation*/
uint8_t* cpy_buff = (uint8_t*)malloc( sizeof(uint64_t)+sizeof(uint16_t) + ( sizeof(uint64_t)*MAX_NBR_OF_INT64 ) ); uint8_t* cpy_buff = (uint8_t*)malloc( sizeof(uint64_t)+sizeof(uint16_t) + ( sizeof(uint64_t)*MAX_NBR_OF_INT64 ) );
memset(cpy_buff, 0,sizeof(uint64_t) + ( sizeof(uint64_t)*MAX_NBR_OF_INT64 )); memset(cpy_buff, 0,sizeof(uint64_t)+sizeof(uint16_t) + ( sizeof(uint64_t)*MAX_NBR_OF_INT64 ));
for (std::size_t i =0; i<mavlink_msg->payload64.size(); i++) for (std::size_t i =0; i<mavlink_msg->payload64.size(); i++)
{ {
message_obt[i] =(uint64_t)mavlink_msg->payload64[i]; message_obt[i] =(uint64_t)mavlink_msg->payload64[i];
@ -733,7 +733,7 @@ inline void CommunicationManager::Send_Mavlink_Message_Callback(
tot =0; tot =0;
number++; number++;
frame = ""; frame = "";
memset(cpy_buff, 0,sizeof(uint64_t)+sizeof(uint16_t) + ( sizeof(uint64_t)*mavlink_msg->payload64.size() )); memset(cpy_buff, 0,sizeof(uint64_t)+sizeof(uint16_t) + ( sizeof(uint64_t)*MAX_NBR_OF_INT64 ));
//std::cout << "total:" <<total << std::endl; //std::cout << "total:" <<total << std::endl;
header=0; header=0;
header = (uint64_t) MESSAGE_CONSTANT | ((uint64_t)check_sum << 16) | ((uint64_t)number << 32) |((uint64_t) total << 48) ; header = (uint64_t) MESSAGE_CONSTANT | ((uint64_t)check_sum << 16) | ((uint64_t)number << 32) |((uint64_t) total << 48) ;
@ -743,10 +743,11 @@ inline void CommunicationManager::Send_Mavlink_Message_Callback(
/*converted_bytes = sprintf( /*converted_bytes = sprintf(
temporary_buffer, "%" PRIu64 " ", temporary_buffer, "%" PRIu64 " ",
(uint64_t)header);*/ (uint64_t)header);*/
delete[] header_16;
//} //}
} }
delete[] header_16;
if(uint64_counter!=mavlink_msg->payload64.size()){ if(uint64_counter!=mavlink_msg->payload64.size()){
tmp_size=mavlink_msg->payload64.size() - uint64_counter; tmp_size=mavlink_msg->payload64.size() - uint64_counter;
/*Copy the header*/ /*Copy the header*/