Skip to content

Ensure read_avail is set for the first non-empty block #6916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sudheerv merged 1 commit into from
Jun 18, 2020
Merged

Ensure read_avail is set for the first non-empty block #6916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/traffic_server/FetchSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ FetchSM::get_info_from_buffer(IOBufferReader *reader)
return;
}

/* Read the data out of the reader */
if (reader->block != NULL)
reader->skip_empty_blocks();

read_avail = reader->read_avail();
Debug(DEBUG_TAG, "[%s] total avail %" PRId64, __FUNCTION__, read_avail);
if (!read_avail) {
Expand All @@ -377,10 +381,6 @@ FetchSM::get_info_from_buffer(IOBufferReader *reader)
info = (char *)ats_malloc(sizeof(char) * (read_avail + 1));
client_response = info;

/* Read the data out of the reader */
if (reader->block != NULL)
reader->skip_empty_blocks();

blk = reader->block.get();

// This is the equivalent of TSIOBufferBlockReadStart()
Expand All @@ -391,7 +391,7 @@ FetchSM::get_info_from_buffer(IOBufferReader *reader)
int bytes_used = 0;
header_done = 1;
if (client_response_hdr.parse_resp(&http_parser, reader, &bytes_used, 0) == PARSE_RESULT_DONE) {
if (bytes_used > 0) {
if ((bytes_used > 0) && (bytes_used <= read_avail)) {
memcpy(info, buf, bytes_used);
info += bytes_used;
client_bytes += bytes_used;
Expand All @@ -418,7 +418,7 @@ FetchSM::get_info_from_buffer(IOBufferReader *reader)
buf = blk->start() + reader->start_offset;
read_done = blk->read_avail() - reader->start_offset;

if (read_done > 0) {
if ((read_done > 0) && ((read_done <= read_avail))) {
memcpy(info, buf, read_done);
reader->consume(read_done);
read_avail -= read_done;
Expand Down Expand Up @@ -453,7 +453,7 @@ FetchSM::get_info_from_buffer(IOBufferReader *reader)
buf = blk->start() + reader->start_offset;
read_done = blk->read_avail() - reader->start_offset;

if (read_done > 0) {
if ((read_done > 0) && (read_done <= read_avail)) {
memcpy(info, buf, read_done);
reader->consume(read_done);
read_avail -= read_done;
Expand Down