You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/11/08 11:30:36 UTC
qpid-broker-j git commit: QPID-7947: [Broker-J] Improve frame handling
Repository: qpid-broker-j
Updated Branches:
refs/heads/6.1.x 11b691ba1 -> 92535ae3d
QPID-7947: [Broker-J] Improve frame handling
Merged by hand from master 66cef783f63ceb0252fbf236ae0577aa5e14b23d
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/92535ae3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/92535ae3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/92535ae3
Branch: refs/heads/6.1.x
Commit: 92535ae3de7178008f70bac94adb8155eeba3848
Parents: 11b691b
Author: Keith Wall <kw...@apache.org>
Authored: Wed Nov 8 11:26:27 2017 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Nov 8 11:26:33 2017 +0000
----------------------------------------------------------------------
.../server/protocol/v1_0/framing/FrameHandler.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/92535ae3/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
index 942629c..bfebd23 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
@@ -65,12 +65,6 @@ public class FrameHandler implements ProtocolHandler
{
size = in.getInt();
- if(remaining < size)
- {
- in.position(in.position()-4);
- break;
- }
- int dataOffset = (in.get() << 2) & 0x3FF;
if (size < 8)
{
@@ -90,6 +84,13 @@ public class FrameHandler implements ProtocolHandler
break;
}
+ if(remaining < size)
+ {
+ in.position(in.position()-4);
+ break;
+ }
+ int dataOffset = (in.get() << 2) & 0x3FF;
+
if (dataOffset < 8)
{
frameParsingError = createFramingError(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org