summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-07-18 17:46:15 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-07-18 17:46:15 +0100
commitaed66d3566058ed5b6d152b538c415fff3241364 (patch)
tree05199b42500282e75df5245475f659d633b37f85
parent8baff4b83a21d34fcd612eed5f4e0200b2775a76 (diff)
downloadrabbitmq-server-bug24991.tar.gz
use new frame_error functionbug24991
-rw-r--r--src/rabbit_reader.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 514069bc..ade6122f 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -617,11 +617,11 @@ post_process_frame(_Frame, _ChPid, State) ->
-define(FRAME_SIZE_FUDGE, ?EMPTY_FRAME_SIZE).
handle_input(frame_header, <<Type:8,Channel:16,PayloadSize:32>>,
- #v1{connection = #connection{frame_max = FrameMax}})
+ State = #v1{connection = #connection{frame_max = FrameMax}})
when FrameMax /= 0 andalso
PayloadSize > FrameMax - ?EMPTY_FRAME_SIZE + ?FRAME_SIZE_FUDGE ->
- throw({frame_too_large, Type, Channel, PayloadSize,
- FrameMax - ?EMPTY_FRAME_SIZE});
+ frame_error({frame_too_large, PayloadSize, FrameMax - ?EMPTY_FRAME_SIZE},
+ Type, Channel, <<>>, State);
handle_input(frame_header, <<Type:8,Channel:16,PayloadSize:32>>, State) ->
ensure_stats_timer(
switch_callback(State, {frame_payload, Type, Channel, PayloadSize},