Skip to content

Don't call next next dup on destroyed mime field mloc. (#7833) #7861

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
ezelkow1 merged 1 commit into from
May 19, 2021
Merged

Don't call next next dup on destroyed mime field mloc. (#7833) #7861

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion plugins/background_fetch/headers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len, const ch
bool first = true;

while (field_loc) {
tmp = TSMimeHdrFieldNextDup(bufp, hdr_loc, field_loc);
if (first) {
first = false;
if (TS_SUCCESS == TSMimeHdrFieldValueStringSet(bufp, hdr_loc, field_loc, -1, val, val_len)) {
Expand All @@ -83,7 +84,6 @@ set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len, const ch
} else {
TSMimeHdrFieldDestroy(bufp, hdr_loc, field_loc);
}
tmp = TSMimeHdrFieldNextDup(bufp, hdr_loc, field_loc);
TSHandleMLocRelease(bufp, hdr_loc, field_loc);
field_loc = tmp;
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/access_control/headers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ setHeader(TSMBuffer bufp, TSMLoc hdrLoc, const char *header, int headerlen, cons
bool first = true;

while (fieldLoc) {
tmp = TSMimeHdrFieldNextDup(bufp, hdrLoc, fieldLoc);
if (first) {
first = false;
if (TS_SUCCESS == TSMimeHdrFieldValueStringSet(bufp, hdrLoc, fieldLoc, -1, value, valuelen)) {
Expand All @@ -164,7 +165,6 @@ setHeader(TSMBuffer bufp, TSMLoc hdrLoc, const char *header, int headerlen, cons
} else {
TSMimeHdrFieldDestroy(bufp, hdrLoc, fieldLoc);
}
tmp = TSMimeHdrFieldNextDup(bufp, hdrLoc, fieldLoc);
TSHandleMLocRelease(bufp, hdrLoc, fieldLoc);
fieldLoc = tmp;
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/cache_fill/background_fetch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len, const ch
bool first = true;

while (field_loc) {
tmp = TSMimeHdrFieldNextDup(bufp, hdr_loc, field_loc);
if (first) {
first = false;
if (TS_SUCCESS == TSMimeHdrFieldValueStringSet(bufp, hdr_loc, field_loc, -1, val, val_len)) {
Expand All @@ -76,7 +77,6 @@ set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len, const ch
} else {
TSMimeHdrFieldDestroy(bufp, hdr_loc, field_loc);
}
tmp = TSMimeHdrFieldNextDup(bufp, hdr_loc, field_loc);
TSHandleMLocRelease(bufp, hdr_loc, field_loc);
field_loc = tmp;
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/cache_range_requests/cache_range_requests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ set_header(TSMBuffer buf, TSMLoc hdr_loc, const char *header, int len, const cha
bool first = true;

while (field_loc) {
tmp = TSMimeHdrFieldNextDup(buf, hdr_loc, field_loc);
if (first) {
first = false;
if (TS_SUCCESS == TSMimeHdrFieldValueStringSet(buf, hdr_loc, field_loc, -1, val, val_len)) {
Expand All @@ -441,7 +442,6 @@ set_header(TSMBuffer buf, TSMLoc hdr_loc, const char *header, int len, const cha
} else {
TSMimeHdrFieldDestroy(buf, hdr_loc, field_loc);
}
tmp = TSMimeHdrFieldNextDup(buf, hdr_loc, field_loc);
TSHandleMLocRelease(buf, hdr_loc, field_loc);
field_loc = tmp;
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/prefetch/headers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ setHeader(TSMBuffer bufp, TSMLoc hdrLoc, const char *header, int headerlen, cons
bool first = true;

while (fieldLoc) {
tmp = TSMimeHdrFieldNextDup(bufp, hdrLoc, fieldLoc);
if (first) {
first = false;
if (TS_SUCCESS == TSMimeHdrFieldValueStringSet(bufp, hdrLoc, fieldLoc, -1, value, valuelen)) {
Expand All @@ -164,7 +165,6 @@ setHeader(TSMBuffer bufp, TSMLoc hdrLoc, const char *header, int headerlen, cons
} else {
TSMimeHdrFieldDestroy(bufp, hdrLoc, fieldLoc);
}
tmp = TSMimeHdrFieldNextDup(bufp, hdrLoc, fieldLoc);
TSHandleMLocRelease(bufp, hdrLoc, fieldLoc);
fieldLoc = tmp;
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/header_rewrite/operators.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ OperatorSetHeader::exec(const Resources &res) const
bool first = true;

while (field_loc) {
tmp = TSMimeHdrFieldNextDup(res.bufp, res.hdr_loc, field_loc);
if (first) {
first = false;
if (TS_SUCCESS == TSMimeHdrFieldValueStringSet(res.bufp, res.hdr_loc, field_loc, -1, value.c_str(), value.size())) {
Expand All @@ -629,7 +630,6 @@ OperatorSetHeader::exec(const Resources &res) const
} else {
TSMimeHdrFieldDestroy(res.bufp, res.hdr_loc, field_loc);
}
tmp = TSMimeHdrFieldNextDup(res.bufp, res.hdr_loc, field_loc);
TSHandleMLocRelease(res.bufp, res.hdr_loc, field_loc);
field_loc = tmp;
}
Expand Down