This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq.git
commit fc4372b9f0f72b8b5eed917f0019c5cea45c5d06 Merge: 78ee343425 3037ce8b3b Author: Christopher L. Shannon <[email protected]> AuthorDate: Tue Feb 25 13:08:04 2025 -0500 Merge pull request #1399 from cshannon/buffer-validation AMQ-6596 - Validate size of buffers during unmarshalling activemq-client/pom.xml | 5 + .../apache/activemq/openwire/OpenWireFormat.java | 118 +++++++--- .../org/apache/activemq/openwire/OpenWireUtil.java | 51 +++- .../openwire/v1/BaseDataStreamMarshaller.java | 12 +- .../activemq/openwire/v1/MessageMarshaller.java | 8 +- .../openwire/v1/PartialCommandMarshaller.java | 4 +- .../openwire/v1/WireFormatInfoMarshaller.java | 4 +- .../openwire/v1/XATransactionIdMarshaller.java | 8 +- .../openwire/v10/BaseDataStreamMarshaller.java | 12 +- .../openwire/v10/ConnectionControlMarshaller.java | 4 +- .../activemq/openwire/v10/MessageMarshaller.java | 8 +- .../openwire/v10/PartialCommandMarshaller.java | 4 +- .../openwire/v10/WireFormatInfoMarshaller.java | 4 +- .../openwire/v10/XATransactionIdMarshaller.java | 8 +- .../openwire/v11/BaseDataStreamMarshaller.java | 12 +- .../openwire/v11/ConnectionControlMarshaller.java | 4 +- .../activemq/openwire/v11/MessageMarshaller.java | 8 +- .../openwire/v11/PartialCommandMarshaller.java | 4 +- .../openwire/v11/WireFormatInfoMarshaller.java | 4 +- .../openwire/v11/XATransactionIdMarshaller.java | 8 +- .../openwire/v12/BaseDataStreamMarshaller.java | 12 +- .../openwire/v12/ConnectionControlMarshaller.java | 4 +- .../activemq/openwire/v12/MessageMarshaller.java | 8 +- .../openwire/v12/PartialCommandMarshaller.java | 4 +- .../openwire/v12/WireFormatInfoMarshaller.java | 4 +- .../openwire/v12/XATransactionIdMarshaller.java | 8 +- .../openwire/v9/BaseDataStreamMarshaller.java | 12 +- .../openwire/v9/ConnectionControlMarshaller.java | 4 +- .../activemq/openwire/v9/MessageMarshaller.java | 8 +- .../openwire/v9/PartialCommandMarshaller.java | 4 +- .../openwire/v9/WireFormatInfoMarshaller.java | 4 +- .../openwire/v9/XATransactionIdMarshaller.java | 8 +- .../apache/activemq/util/IOExceptionSupport.java | 8 +- .../apache/activemq/openwire/OpenWireUtilTest.java | 103 ++++++++ .../activemq/openwire/OpenWireValidationTest.java | 261 +++++++++++++++++++-- activemq-openwire-legacy/pom.xml | 5 + .../openwire/v2/BaseDataStreamMarshaller.java | 12 +- .../activemq/openwire/v2/MessageMarshaller.java | 8 +- .../openwire/v2/PartialCommandMarshaller.java | 4 +- .../openwire/v2/WireFormatInfoMarshaller.java | 4 +- .../openwire/v2/XATransactionIdMarshaller.java | 8 +- .../openwire/v3/BaseDataStreamMarshaller.java | 12 +- .../activemq/openwire/v3/MessageMarshaller.java | 8 +- .../openwire/v3/PartialCommandMarshaller.java | 4 +- .../openwire/v3/WireFormatInfoMarshaller.java | 4 +- .../openwire/v3/XATransactionIdMarshaller.java | 8 +- .../openwire/v4/BaseDataStreamMarshaller.java | 12 +- .../activemq/openwire/v4/MessageMarshaller.java | 8 +- .../openwire/v4/PartialCommandMarshaller.java | 4 +- .../openwire/v4/WireFormatInfoMarshaller.java | 4 +- .../openwire/v4/XATransactionIdMarshaller.java | 8 +- .../openwire/v5/BaseDataStreamMarshaller.java | 12 +- .../activemq/openwire/v5/MessageMarshaller.java | 8 +- .../openwire/v5/PartialCommandMarshaller.java | 4 +- .../openwire/v5/WireFormatInfoMarshaller.java | 4 +- .../openwire/v5/XATransactionIdMarshaller.java | 8 +- .../openwire/v6/BaseDataStreamMarshaller.java | 12 +- .../activemq/openwire/v6/MessageMarshaller.java | 8 +- .../openwire/v6/PartialCommandMarshaller.java | 4 +- .../openwire/v6/WireFormatInfoMarshaller.java | 4 +- .../openwire/v6/XATransactionIdMarshaller.java | 8 +- .../openwire/v7/BaseDataStreamMarshaller.java | 12 +- .../activemq/openwire/v7/MessageMarshaller.java | 8 +- .../openwire/v7/PartialCommandMarshaller.java | 4 +- .../openwire/v7/WireFormatInfoMarshaller.java | 4 +- .../openwire/v7/XATransactionIdMarshaller.java | 8 +- .../openwire/v8/BaseDataStreamMarshaller.java | 12 +- .../openwire/v8/ConnectionControlMarshaller.java | 4 +- .../activemq/openwire/v8/MessageMarshaller.java | 8 +- .../openwire/v8/PartialCommandMarshaller.java | 4 +- .../openwire/v8/WireFormatInfoMarshaller.java | 4 +- .../openwire/v8/XATransactionIdMarshaller.java | 8 +- .../openwire/OpenWireLegacyValidationTest.java | 46 +++- pom.xml | 6 + 74 files changed, 796 insertions(+), 259 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
