Merge pull request #371 from ROBOTIS-GIT/ros2-devel

Fix two potential memory leaks. (#361)
ROBOTIS-GIT · Jan 9, 2020 · 20bd95f · 20bd95f
2 parents 6791c4b + 5e34924
commit 20bd95f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/dynamixel_sdk/src/dynamixel_sdk/protocol1_packet_handler.cpp b/dynamixel_sdk/src/dynamixel_sdk/protocol1_packet_handler.cpp
@@ -412,6 +412,9 @@ int Protocol1PacketHandler::readRx(PortHandler *port, uint8_t id, uint16_t lengt
   uint8_t *rxpacket           = (uint8_t *)malloc(RXPACKET_MAX_LEN); //(length+6);
   //uint8_t *rxpacket         = new uint8_t[length+6];
 
+  if (rxpacket == NULL)
+    return result;
+
   do {
     result = rxPacket(port, rxpacket);
   } while (result == COMM_SUCCESS && rxpacket[PKT_ID] != id);
@@ -441,8 +444,14 @@ int Protocol1PacketHandler::readTxRx(PortHandler *port, uint8_t id, uint16_t add
   uint8_t txpacket[8]         = {0};
   uint8_t *rxpacket           = (uint8_t *)malloc(RXPACKET_MAX_LEN);//(length+6);
 
+  if (rxpacket == NULL)
+    return result;
+
   if (id >= BROADCAST_ID)
+  {
+    free(rxpacket);
     return COMM_NOT_AVAILABLE;
+  }
 
   txpacket[PKT_ID]            = id;
   txpacket[PKT_LENGTH]        = 4;
@@ -539,6 +548,9 @@ int Protocol1PacketHandler::writeTxOnly(PortHandler *port, uint8_t id, uint16_t
   uint8_t *txpacket           = (uint8_t *)malloc(length+7);
   //uint8_t *txpacket           = new uint8_t[length+7];
 
+  if (txpacket == NULL)
+    return result;
+
   txpacket[PKT_ID]            = id;
   txpacket[PKT_LENGTH]        = length+3;
   txpacket[PKT_INSTRUCTION]   = INST_WRITE;
@@ -564,6 +576,9 @@ int Protocol1PacketHandler::writeTxRx(PortHandler *port, uint8_t id, uint16_t ad
   //uint8_t *txpacket           = new uint8_t[length+7];
   uint8_t rxpacket[6]         = {0};
 
+  if (txpacket == NULL)
+    return result;
+
   txpacket[PKT_ID]            = id;
   txpacket[PKT_LENGTH]        = length+3;
   txpacket[PKT_INSTRUCTION]   = INST_WRITE;
@@ -620,6 +635,9 @@ int Protocol1PacketHandler::regWriteTxOnly(PortHandler *port, uint8_t id, uint16
   uint8_t *txpacket           = (uint8_t *)malloc(length+6);
   //uint8_t *txpacket           = new uint8_t[length+6];
 
+  if (txpacket == NULL)
+    return result;
+
   txpacket[PKT_ID]            = id;
   txpacket[PKT_LENGTH]        = length+3;
   txpacket[PKT_INSTRUCTION]   = INST_REG_WRITE;
@@ -645,6 +663,9 @@ int Protocol1PacketHandler::regWriteTxRx(PortHandler *port, uint8_t id, uint16_t
   //uint8_t *txpacket           = new uint8_t[length+6];
   uint8_t rxpacket[6]         = {0};
 
+  if (txpacket == NULL)
+    return result;
+
   txpacket[PKT_ID]            = id;
   txpacket[PKT_LENGTH]        = length+3;
   txpacket[PKT_INSTRUCTION]   = INST_REG_WRITE;
@@ -674,6 +695,9 @@ int Protocol1PacketHandler::syncWriteTxOnly(PortHandler *port, uint16_t start_ad
   // 8: HEADER0 HEADER1 ID LEN INST START_ADDR DATA_LEN ... CHKSUM
   //uint8_t *txpacket           = new uint8_t[param_length + 8];
 
+  if (txpacket == NULL)
+    return result;
+
   txpacket[PKT_ID]            = BROADCAST_ID;
   txpacket[PKT_LENGTH]        = param_length + 4; // 4: INST START_ADDR DATA_LEN ... CHKSUM
   txpacket[PKT_INSTRUCTION]   = INST_SYNC_WRITE;
@@ -699,6 +723,9 @@ int Protocol1PacketHandler::bulkReadTx(PortHandler *port, uint8_t *param, uint16
   // 7: HEADER0 HEADER1 ID LEN INST 0x00 ... CHKSUM
   //uint8_t *txpacket           = new uint8_t[param_length + 7];
 
+  if (txpacket == NULL)
+    return result;
+
   txpacket[PKT_ID]            = BROADCAST_ID;
   txpacket[PKT_LENGTH]        = param_length + 3; // 3: INST 0x00 ... CHKSUM
   txpacket[PKT_INSTRUCTION]   = INST_BULK_READ;

diff --git a/dynamixel_sdk/src/dynamixel_sdk/protocol2_packet_handler.cpp b/dynamixel_sdk/src/dynamixel_sdk/protocol2_packet_handler.cpp
@@ -716,7 +716,10 @@ int Protocol2PacketHandler::readTxRx(PortHandler *port, uint8_t id, uint16_t add
     return result;
 
   if (id >= BROADCAST_ID)
+  {
+    free(rxpacket);
     return COMM_NOT_AVAILABLE;
+  }
 
   txpacket[PKT_ID]            = id;
   txpacket[PKT_LENGTH_L]      = 7;