Skip to content

fix stack buffer overflow in SaveAsFile backup path construction #6420

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

Open
Dhanu-dynamic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix stack buffer overflow in SaveAsFile backup path construction #6420

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
23 changes: 18 additions & 5 deletions libpromises/files_operators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,18 +209,31 @@ bool SaveAsFile(EvalContext *ctx, SaveCallbackFn callback, void *param, const ch
}
}

strcpy(backup, BufferData(deref_file));
const char *deref = BufferData(deref_file);

strlcpy(backup, deref, sizeof(backup));

if (a->edits.backup == BACKUP_OPTION_TIMESTAMP)
{
snprintf(stamp, CF_BUFSIZE, "_%jd_%s", (intmax_t) CFSTARTTIME, CanonifyName(ctime(&stamp_now)));
strcat(backup, stamp);
strlcat(backup, stamp, sizeof(backup));
}

strcat(backup, ".cf-before-edit");
if (strlcat(backup, ".cf-before-edit", sizeof(backup)) >= sizeof(backup))
{
Log(LOG_LEVEL_ERR,
"Filename too long to create backup for editing: %s",
BufferData(pretty_file));
goto end;
}

strcpy(new, BufferData(deref_file));
strcat(new, ".cf-after-edit");
if (strlcpy(new, deref, sizeof(new)) >= sizeof(new) ||
strlcat(new, ".cf-after-edit", sizeof(new)) >= sizeof(new))
{
Log(LOG_LEVEL_ERR, "Filename too long to edit: %s",
BufferData(pretty_file));
goto end;
}
unlink(new); /* Just in case of races */

if ((*callback)(new, param, new_line_mode) == false)
Expand Down
Loading