You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by cm...@apache.org on 2025/07/10 12:57:18 UTC
(trafficserver) branch 10.1.x updated (831e11c6b0 -> de7338bfff)
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
from 831e11c6b0 Return captive_action from HttpCachSM if read retry event is scheduled (#12313)
new 678274433f xdebug: release the client request MLoc (#12332)
new de7338bfff ja3_fingerprint: fix leak of duplicate header fields (#12331)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
plugins/ja3_fingerprint/ja3_fingerprint.cc | 10 ++++++----
plugins/xdebug/xdebug.cc | 2 ++
2 files changed, 8 insertions(+), 4 deletions(-)
(trafficserver) 02/02: ja3_fingerprint: fix leak of duplicate header fields (#12331)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit de7338bffff68c3704468774077804c9197ccd4f
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Tue Jul 8 13:44:06 2025 -0500
ja3_fingerprint: fix leak of duplicate header fields (#12331)
When looping through duplicate header fields with TSMimeHdrFieldNextDup,
each iteration must free the TSMLoc. ja3_fingerprint had a loop where it
did not do this, thus it leaked these. This adds the required
TSHandleMLocRelease.
(cherry picked from commit 0c08c8d2051b5956b9218249277c201b8e52a755)
---
plugins/ja3_fingerprint/ja3_fingerprint.cc | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/plugins/ja3_fingerprint/ja3_fingerprint.cc b/plugins/ja3_fingerprint/ja3_fingerprint.cc
index b1403d8ae6..3fb84f8309 100644
--- a/plugins/ja3_fingerprint/ja3_fingerprint.cc
+++ b/plugins/ja3_fingerprint/ja3_fingerprint.cc
@@ -181,10 +181,12 @@ append_to_field(TSMBuffer bufp, TSMLoc hdr_loc, const char *field, int field_len
TSMimeHdrFieldAppend(bufp, hdr_loc, target);
TSMimeHdrFieldValueStringInsert(bufp, hdr_loc, target, -1, value, value_len);
} else if (!preserve) {
- TSMLoc next = target;
- while (next) {
- target = next;
- next = TSMimeHdrFieldNextDup(bufp, hdr_loc, target);
+ // Find the last duplicate, being careful to release the previous TSMLoc along the way.
+ TSMLoc dup = TSMimeHdrFieldNextDup(bufp, hdr_loc, target);
+ while (dup != TS_NULL_MLOC) {
+ TSHandleMLocRelease(bufp, hdr_loc, target);
+ target = dup;
+ dup = TSMimeHdrFieldNextDup(bufp, hdr_loc, target);
}
TSMimeHdrFieldValueStringInsert(bufp, hdr_loc, target, -1, value, value_len);
}
(trafficserver) 01/02: xdebug: release the client request MLoc (#12332)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 678274433f097801c6fd2ec23136b9879b95e47b
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Tue Jul 8 13:43:40 2025 -0500
xdebug: release the client request MLoc (#12332)
XScanRequestHeaders missed a TSHandleMLocRelease call for the client
request MLoc resource.
(cherry picked from commit df8067757feeb4f6d3bd45ce2421203cc0c7c44b)
---
plugins/xdebug/xdebug.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/plugins/xdebug/xdebug.cc b/plugins/xdebug/xdebug.cc
index 936650470d..ecc36ec8f5 100644
--- a/plugins/xdebug/xdebug.cc
+++ b/plugins/xdebug/xdebug.cc
@@ -778,6 +778,8 @@ XScanRequestHeaders(TSCont /* contp */, TSEvent event, void *edata)
}
}
+ // Release the request header MLoc.
+ TSHandleMLocRelease(buffer, TS_NULL_MLOC, hdr);
return TS_EVENT_NONE;
}