This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch activemq-6.1.x in repository https://gitbox.apache.org/repos/asf/activemq.git
commit 021a7a4eeea18f7189104b28bd07f81383e23282 Author: Christopher L. Shannon <[email protected]> AuthorDate: Fri Nov 21 14:33:27 2025 -0500 AMQ-9810 - Add additional validation for MQTT control packets Validate that the remaining length field is the correct number of bytes --- .../org/apache/activemq/transport/mqtt/MQTTCodec.java | 2 +- .../org/apache/activemq/transport/mqtt/MQTTCodecTest.java | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTCodec.java b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTCodec.java index 66a0ae5eb0..06efe49910 100644 --- a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTCodec.java +++ b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTCodec.java @@ -25,7 +25,7 @@ import org.fusesource.mqtt.codec.MQTTFrame; public class MQTTCodec { - static final int MAX_MULTIPLIER = (int) Math.pow(2, 21); + private static final int MAX_MULTIPLIER = (int) Math.pow(2, 21); private final MQTTFrameSink frameSink; private final MQTTWireFormat wireFormat; diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java index 994bff4e67..3018010fa4 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java @@ -330,7 +330,6 @@ public class MQTTCodecTest { fail("Parsing should have failed invalid remaining length field"); } catch (IOException e) { // expected - assertEquals("Remaining length exceeds 4 bytes", e.getMessage()); } } @@ -345,20 +344,6 @@ public class MQTTCodecTest { fail("Parsing should have failed invalid remaining length field"); } catch (IOException e) { // expected - assertEquals("Remaining length exceeds 4 bytes", e.getMessage()); - } - } - - @Test - public void testUnmarshalInvalidRemainingLengthField() { - try { - // Test Invalid remaining field checking using the marshaller - wireFormat.unmarshal(new ByteSequence(new byte[]{CONNECT.TYPE, (byte) 0x81, (byte) 0x81, - (byte) 0x81, (byte) 0x81})); - fail("Parsing should have failed invalid remaining length field"); - } catch (IOException e) { - // expected - assertEquals("Remaining length exceeds 4 bytes", e.getMessage()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
