aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Fish <[email protected]>2013-06-11 21:47:26 +0100
committerJames Fish <[email protected]>2013-07-05 22:45:18 +0100
commitf0cc2d01e64f489275821b56c7e4343e4aa5bf97 (patch)
tree32971aa12cfbf2c5675317c1499673d6542eeda1 /src
parent116acaead7c988bf292bdae68e9016ef962553da (diff)
downloadcowboy-f0cc2d01e64f489275821b56c7e4343e4aa5bf97.tar.gz
cowboy-f0cc2d01e64f489275821b56c7e4343e4aa5bf97.tar.bz2
cowboy-f0cc2d01e64f489275821b56c7e4343e4aa5bf97.zip
Fix decoding of chunked body.
Previously cowboy_http:te_chunked/2 would enter an incorrect state if it tried to parse an incomplete chunk when the length was known from the partial chunk. Previosuly cowboy_http:te_chunked/2 expected the trailing "\r\n" to always be present if chunk body was present in the buffer. This is not guaranteed and so this commit accommodates that situation.
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_http.erl38
1 files changed, 32 insertions, 6 deletions
diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl
index 7e20615..f2defdc 100644
--- a/src/cowboy_http.erl
+++ b/src/cowboy_http.erl
@@ -963,8 +963,17 @@ te_chunked(Data, {0, Streamed}) ->
%% @todo We are expecting an hex size, not a general token.
token(Data,
fun (<< "\r\n", Rest/binary >>, BinLen) ->
- Len = list_to_integer(binary_to_list(BinLen), 16),
- te_chunked(Rest, {Len, Streamed});
+ case list_to_integer(binary_to_list(BinLen), 16) of
+ %% Final chunk is parsed in one go above. Rest would be
+ %% <<\r\n">> if complete.
+ 0 when byte_size(Rest) < 2 ->
+ more;
+ %% Normal chunk. Add 2 to Len for trailing <<"\r\n">>. Note
+ %% that repeated <<"-2\r\n">> would be streamed, and
+ %% accumulated, until out of memory if Len could be -2.
+ Len when Len > 0 ->
+ te_chunked(Rest, {Len + 2, Streamed})
+ end;
%% Chunk size shouldn't take too many bytes,
%% don't try to stream forever.
(Rest, _) when byte_size(Rest) < 16 ->
@@ -972,11 +981,28 @@ te_chunked(Data, {0, Streamed}) ->
(_, _) ->
{error, badarg}
end);
-te_chunked(Data, {ChunkRem, Streamed}) when byte_size(Data) >= ChunkRem + 2 ->
- << Chunk:ChunkRem/binary, "\r\n", Rest/binary >> = Data,
- {ok, Chunk, Rest, {0, Streamed + byte_size(Chunk)}};
+%% <<"\n">> from trailing <<"\r\n">>.
+te_chunked(<< "\n", Rest/binary>>, {1, Streamed}) ->
+ {ok, <<>>, Rest, {0, Streamed}};
+te_chunked(<<>>, State={1, _Streamed}) ->
+ {more, 1, <<>>, State};
+%% Remainder of chunk (if any) and as much of trailing <<"\r\n">> as possible.
+te_chunked(Data, {ChunkRem, Streamed}) when byte_size(Data) >= ChunkRem - 2 ->
+ ChunkSize = ChunkRem - 2,
+ Streamed2 = Streamed + ChunkSize,
+ case Data of
+ << Chunk:ChunkSize/binary, "\r\n", Rest/binary >> ->
+ {ok, Chunk, Rest, {0, Streamed2}};
+ << Chunk:ChunkSize/binary, "\r" >> ->
+ {more, 1, Chunk, {1, Streamed2}};
+ << Chunk:ChunkSize/binary >> ->
+ {more, 2, Chunk, {2, Streamed2}}
+ end;
+%% Incomplete chunk.
te_chunked(Data, {ChunkRem, Streamed}) ->
- {more, ChunkRem + 2, Data, {ChunkRem, Streamed}}.
+ ChunkRem2 = ChunkRem - byte_size(Data),
+ Streamed2 = Streamed + byte_size(Data),
+ {more, ChunkRem2, Data, {ChunkRem2, Streamed2}}.
%% @doc Decode an identity stream.
-spec te_identity(Bin, TransferState)