Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions changes-entries/cern-meta-header-injection.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*) mod_cern_meta: Reject HTTP framing headers in metadata files to prevent
response splitting. [Joe Orton]
2 changes: 2 additions & 0 deletions changes-entries/ldap-url-cache-uaf.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*) mod_ldap: Fix intermittent worker crashes under concurrent
LDAP-authenticated requests. [Joe Orton]
2 changes: 2 additions & 0 deletions changes-entries/remoteip-proxy-v2-local.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*) mod_remoteip: Fix crash with PROXY v2 LOCAL command and
RemoteIPProxyProtocol enabled. [Joe Orton]
2 changes: 2 additions & 0 deletions changes-entries/substitute-maxlinelength-overflow.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*) mod_substitute: Fix SubstituteMaxLineLength to reject values too
large for the K/M/G suffix. [Joe Orton]
2 changes: 2 additions & 0 deletions changes-entries/substitute-pattern-oob-read.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*) mod_substitute: Fix crash or misbehaviour when loading a Substitute
directive with a missing closing delimiter. [Joe Orton]
10 changes: 8 additions & 2 deletions modules/filters/mod_substitute.c
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ static const char *set_pattern(cmd_parms *cmd, void *cfg, const char *line)
if (delim)
from = ++ourline;
if (from) {
if (*ourline != delim) {
if (*ourline && *ourline != delim) {
while (*++ourline && *ourline != delim);
}
if (*ourline) {
Expand All @@ -688,7 +688,7 @@ static const char *set_pattern(cmd_parms *cmd, void *cfg, const char *line)
}
}
if (to) {
if (*ourline != delim) {
if (*ourline && *ourline != delim) {
while (*++ourline && *ourline != delim);
}
if (*ourline) {
Expand Down Expand Up @@ -777,12 +777,18 @@ static const char *set_max_line_length(cmd_parms *cmd, void *cfg, const char *ar
rv = apr_strtoff(&max, arg, &end, 10);
if (rv == APR_SUCCESS) {
if ((*end == 'K' || *end == 'k') && !end[1]) {
if (max > APR_INT64_MAX / KBYTE)
return "SubstituteMaxLineLength value too large";
max *= KBYTE;
}
else if ((*end == 'M' || *end == 'm') && !end[1]) {
if (max > APR_INT64_MAX / MBYTE)
return "SubstituteMaxLineLength value too large";
max *= MBYTE;
}
else if ((*end == 'G' || *end == 'g') && !end[1]) {
if (max > APR_INT64_MAX / GBYTE)
return "SubstituteMaxLineLength value too large";
max *= GBYTE;
}
else if (*end && /* neither empty nor [Bb] */
Expand Down
Loading