aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/packet_parser.c22
-rw-r--r--erts/emulator/test/decode_packet_SUITE.erl6
2 files changed, 11 insertions, 17 deletions
diff --git a/erts/emulator/beam/packet_parser.c b/erts/emulator/beam/packet_parser.c
index 8c1662dc6f..4d4b6ea196 100644
--- a/erts/emulator/beam/packet_parser.c
+++ b/erts/emulator/beam/packet_parser.c
@@ -405,18 +405,22 @@ int packet_get_length(enum PacketParseType htype,
const char* ptr1 = ptr;
int len = plen;
+ if (!max_plen) {
+ /* This is for backward compatibility with old user of decode_packet
+ * that might use option 'line_length' to limit accepted length of
+ * http lines.
+ */
+ max_plen = trunc_len;
+ }
+
while (1) {
const char* ptr2 = memchr(ptr1, '\n', len);
if (ptr2 == NULL) {
if (max_plen != 0) {
- if (n > max_plen) /* packet full */
+ if (n >= max_plen) /* packet full */
goto error;
}
- else if (n >= trunc_len && trunc_len!=0) { /* buffer full */
- plen = trunc_len;
- goto done;
- }
goto more;
}
else {
@@ -425,8 +429,6 @@ int packet_get_length(enum PacketParseType htype,
if (*statep == 0) {
if (max_plen != 0 && plen > max_plen)
goto error;
- if (plen >= trunc_len && trunc_len != 0)
- plen = trunc_len;
goto done;
}
@@ -439,18 +441,12 @@ int packet_get_length(enum PacketParseType htype,
else {
if (max_plen != 0 && plen > max_plen)
goto error;
- if (plen >= trunc_len && trunc_len != 0)
- plen = trunc_len;
goto done;
}
}
else {
if (max_plen != 0 && plen > max_plen)
goto error;
- if (plen >= trunc_len && trunc_len != 0) {
- plen = trunc_len;
- goto done;
- }
goto more;
}
}
diff --git a/erts/emulator/test/decode_packet_SUITE.erl b/erts/emulator/test/decode_packet_SUITE.erl
index 55ef05079f..4acbe8c6e0 100644
--- a/erts/emulator/test/decode_packet_SUITE.erl
+++ b/erts/emulator/test/decode_packet_SUITE.erl
@@ -596,11 +596,9 @@ otp_9389(Config) when is_list(Config) ->
{more, undefined} = erlang:decode_packet(httph, Rest2, Opts),
{ok, {http_header,_,"Link",_,Link}, Rest3} =
erlang:decode_packet(httph, list_to_binary([Rest2, Pkt2]), Opts),
- true = (length(Link) =< 3000),
- {ok, {http_error, _}, Rest4} = erlang:decode_packet(httph, Rest3, Opts),
- {ok, {http_error, _}, Rest5} = erlang:decode_packet(httph, Rest4, Opts),
+ true = (length(Link) > 8000),
{ok, {http_header,_,'Content-Length',_,"0"}, <<"\r\n">>} =
- erlang:decode_packet(httph, Rest5, Opts),
+ erlang:decode_packet(httph, Rest3, Opts),
ok.
otp_9389_line(doc) -> ["Verify packet_size works correctly for line mode"];