diff options
| author | Alan Conway <aconway@apache.org> | 2011-08-18 18:03:22 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-08-18 18:03:22 +0000 |
| commit | 29480062bc5dfc420d13f29880662bc47edd4bd0 (patch) | |
| tree | 82e3d5d4ef5c1d207ee8ac5a023d3a0911e98585 /cpp/src/qpid/broker/Connection.cpp | |
| parent | 5e59cfc6ce8eea0c19683710707fad6d7406ba75 (diff) | |
| download | qpid-python-29480062bc5dfc420d13f29880662bc47edd4bd0.tar.gz | |
QPID-3033: Segmentation fault while processing session.attach
The initial fix for this bug was incomplete.
The original bug was triggered by a faulty client sending
session.attach before connection.open. The special case is when the
session.attach is on channel 0. This commit fixes the broker for all
cases where a faulty client sends frames before completly opening the
connection.
Older versions of the Java client are known to send this faulty sequence sporadically,
see https://issues.apache.org/jira/browse/QPID-3042.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1159329 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Connection.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Connection.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp index 8362a9782c..0b3059d26c 100644 --- a/cpp/src/qpid/broker/Connection.cpp +++ b/cpp/src/qpid/broker/Connection.cpp @@ -156,16 +156,7 @@ Connection::~Connection() void Connection::received(framing::AMQFrame& frame) { // Received frame on connection so delay timeout restartTimeout(); - - if (frame.getChannel() == 0 && frame.getMethod()) { - adapter.handle(frame); - } else { - if (adapter.isOpen()) - getChannel(frame.getChannel()).in(frame); - else - close(connection::CLOSE_CODE_FRAMING_ERROR, "Connection not yet open, invalid frame received."); - } - + adapter.handle(frame); if (isLink) //i.e. we are acting as the client to another broker recordFromServer(frame); else |