From b87545f0c86fa0e2787b261b23716d66c2119f43 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Wed, 8 Jan 2020 08:41:59 -0800 Subject: [PATCH] [mesh-forwarder] fix incorrect cast to uint8_t when setting frame length (#4456) --- src/core/mac/mac_frame.cpp | 2 +- src/core/thread/mesh_forwarder.cpp | 4 ++-- src/core/thread/mesh_forwarder_ftd.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/mac/mac_frame.cpp b/src/core/mac/mac_frame.cpp index 4ff4dea64..c475fa65e 100644 --- a/src/core/mac/mac_frame.cpp +++ b/src/core/mac/mac_frame.cpp @@ -913,7 +913,7 @@ otError Frame::AppendHeaderIe(HeaderIe *aIeList, uint8_t aIeCount) cur += aIeList[i].GetLength(); } - SetPsduLength(GetPsduLength() + static_cast(cur - base)); + SetPsduLength(GetPsduLength() + static_cast(cur - base)); exit: return error; diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index 3a8e132c2..ec20e1aaa 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -796,7 +796,7 @@ start: // copy IPv6 Payload aMessage.Read(aMessage.GetOffset(), payloadLength, payload); - aFrame.SetPayloadLength(static_cast(headerLength + payloadLength)); + aFrame.SetPayloadLength(headerLength + payloadLength); nextOffset = aMessage.GetOffset() + payloadLength; aMessage.SetOffset(0); @@ -826,7 +826,7 @@ start: // Copy IPv6 Payload aMessage.Read(aMessage.GetOffset(), payloadLength, payload); - aFrame.SetPayloadLength(static_cast(headerLength + payloadLength)); + aFrame.SetPayloadLength(headerLength + payloadLength); nextOffset = aMessage.GetOffset() + payloadLength; } diff --git a/src/core/thread/mesh_forwarder_ftd.cpp b/src/core/thread/mesh_forwarder_ftd.cpp index 1048c0ec5..9e644d4cd 100644 --- a/src/core/thread/mesh_forwarder_ftd.cpp +++ b/src/core/thread/mesh_forwarder_ftd.cpp @@ -330,7 +330,7 @@ void MeshForwarder::SendMesh(Message &aMessage, Mac::TxFrame &aFrame) // write payload assert(aMessage.GetLength() <= aFrame.GetMaxPayloadLength()); aMessage.Read(0, aMessage.GetLength(), aFrame.GetPayload()); - aFrame.SetPayloadLength(static_cast(aMessage.GetLength())); + aFrame.SetPayloadLength(aMessage.GetLength()); mMessageNextOffset = aMessage.GetLength(); }