From 4f6d130f3bde3bada90aa0fb3efd38b806f1bfff Mon Sep 17 00:00:00 2001 From: Martin Trgina Date: Wed, 21 Mar 2018 21:42:02 +0100 Subject: [PATCH] Correct buffer position for MAVLINK2 Correct buffer.position for reading MAVLINK2 messages. --- src/me/drton/jmavlib/mavlink/MAVLinkMessage.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/me/drton/jmavlib/mavlink/MAVLinkMessage.java b/src/me/drton/jmavlib/mavlink/MAVLinkMessage.java index a3bafa1..da72038 100644 --- a/src/me/drton/jmavlib/mavlink/MAVLinkMessage.java +++ b/src/me/drton/jmavlib/mavlink/MAVLinkMessage.java @@ -118,8 +118,7 @@ public MAVLinkMessage(MAVLinkSchema schema, ByteBuffer buffer) if (definition == null) { // Unknown message skip it if (protocolVersion == 2) { - buffer.position(buffer.position() + payloadLen + CRC_LENGTH + getSignatureLength() + - MAVLINK2_MSGID_EXTENSION + MAVLINK2_compatFlags_EXTENSION); + buffer.position(buffer.position() + payloadLen + CRC_LENGTH + getSignatureLength()); } else { buffer.position(buffer.position() + payloadLen + CRC_LENGTH); } @@ -127,8 +126,7 @@ public MAVLinkMessage(MAVLinkSchema schema, ByteBuffer buffer) } if (protocolVersion == 2 && (payloadLen > definition.payloadLength)) { - buffer.position(buffer.position() + payloadLen + CRC_LENGTH + getSignatureLength() + - MAVLINK2_MSGID_EXTENSION + MAVLINK2_compatFlags_EXTENSION); + buffer.position(buffer.position() + payloadLen + CRC_LENGTH + getSignatureLength()); throw new MAVLinkUnknownMessage( String.format("Invalid payload len for msg %s (%s): %s, should be %s to %s", definition.name, msgID, payloadLen, definition.payloadMinimumLength, definition.payloadLength));