Skip to content

ENT-13590: Fixed heap buffer overflow in files edit_line (3.24.x) #6001

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
larsewi merged 2 commits into from
Dec 19, 2025
+10 −10
Merged

ENT-13590: Fixed heap buffer overflow in files edit_line (3.24.x) #6001

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d07b0b9
files_editline.c: removed trailing whitespace
larsewi Dec 11, 2025
fc96c70
Fixed heap buffer overflow in files edit_line
larsewi Dec 11, 2025
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
20 changes: 10 additions & 10 deletions cf-agent/files_editline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,11 +1715,11 @@ static bool MatchPolicy(EvalContext *ctx, const char *camel, const char *haystac
char *work = xcalloc(1, work_size);
strcpy(work, sp);

int written = snprintf(final, final_size, "\\s*%s",
int written = snprintf(final, final_size, "\\s*%s",
work);
if (written < 0)
{
Log(LOG_LEVEL_ERR,
Log(LOG_LEVEL_ERR,
"Unexpected failure from snprintf "
"(%d - %s) on '%s' (MatchPolicy)",
errno, GetErrorStr(), final);
Expand All @@ -1729,13 +1729,13 @@ static bool MatchPolicy(EvalContext *ctx, const char *camel, const char *haystac
{
final = xrealloc(final, work_size);
final_size = work_size;
written = snprintf(final, final_size, "\\s*%s",
written = snprintf(final, final_size, "\\s*%s",
work);
if (written < 0)
{
Log(LOG_LEVEL_ERR,
Log(LOG_LEVEL_ERR,
"Unexpected failure from snprintf "
"(%d - %s) on '%s' (MatchPolicy)",
"(%d - %s) on '%s' (MatchPolicy)",
errno, GetErrorStr(), final);
return false;
}
Expand All @@ -1746,7 +1746,7 @@ static bool MatchPolicy(EvalContext *ctx, const char *camel, const char *haystac
}
else if (opt == INSERT_MATCH_TYPE_IGNORE_TRAILING)
{
if (!StringEqualN(final + final_size - 5, "\\s*", 3))
if (final_size >= 5 && !StringEqualN(final + final_size - 5, "\\s*", 3))
{
const size_t work_size = final_size + 3;
char *work = xcalloc(1, work_size);
Expand All @@ -1758,9 +1758,9 @@ static bool MatchPolicy(EvalContext *ctx, const char *camel, const char *haystac
int written = snprintf(final, final_size, "%s\\s*", work);
if (written < 0)
{
Log(LOG_LEVEL_ERR,
Log(LOG_LEVEL_ERR,
"Unexpected failure from snprintf "
"(%d - %s) on '%s' (MatchPolicy)",
"(%d - %s) on '%s' (MatchPolicy)",
errno, GetErrorStr(), final);
return false;
}
Expand All @@ -1771,9 +1771,9 @@ static bool MatchPolicy(EvalContext *ctx, const char *camel, const char *haystac
written = snprintf(final, final_size, "%s\\s*", work);
if (written < 0)
{
Log(LOG_LEVEL_ERR,
Log(LOG_LEVEL_ERR,
"Unexpected failure from snprintf "
"(%d - %s) on '%s' (MatchPolicy)",
"(%d - %s) on '%s' (MatchPolicy)",
errno, GetErrorStr(), final);
return false;
}
Expand Down
Loading