Skip to content

src: avoid C strings in more C++ exception throws #60592

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
nodejs-github-bot merged 2 commits into from
Nov 7, 2025
+20 −11
Merged

src: avoid C strings in more C++ exception throws #60592

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ef9d0b
src: avoid C strings in more C++ exception throws
addaleax Nov 5, 2025
cf80eb8
fixup! src: avoid C strings in more C++ exception throws
addaleax Nov 5, 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
18 changes: 7 additions & 11 deletions src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3526,12 +3526,10 @@ static void CpSyncCopyDir(const FunctionCallbackInfo<Value>& args) {
if (!dereference &&
std::filesystem::is_directory(symlink_target) &&
isInsideDir(symlink_target, current_dest_symlink_target)) {
std::string message =
static constexpr const char* message =
"Cannot copy %s to a subdirectory of self %s";
THROW_ERR_FS_CP_EINVAL(env,
message.c_str(),
symlink_target.c_str(),
current_dest_symlink_target.c_str());
THROW_ERR_FS_CP_EINVAL(
env, message, symlink_target, current_dest_symlink_target);
return false;
}

Expand All @@ -3540,12 +3538,10 @@ static void CpSyncCopyDir(const FunctionCallbackInfo<Value>& args) {
// and therefore a broken symlink would be created.
if (std::filesystem::is_directory(dest_file_path) &&
isInsideDir(current_dest_symlink_target, symlink_target)) {
std::string message = "cannot overwrite %s with %s";
static constexpr const char* message =
"cannot overwrite %s with %s";
THROW_ERR_FS_CP_SYMLINK_TO_SUBDIRECTORY(
env,
message.c_str(),
current_dest_symlink_target.c_str(),
symlink_target.c_str());
env, message, current_dest_symlink_target, symlink_target);
return false;
}

Expand Down Expand Up @@ -3597,7 +3593,7 @@ static void CpSyncCopyDir(const FunctionCallbackInfo<Value>& args) {
THROW_ERR_FS_CP_EEXIST(isolate,
"[ERR_FS_CP_EEXIST]: Target already exists: "
"cp returned EEXIST (%s already exists)",
dest_file_path.c_str());
dest_file_path);
return false;
}
env->ThrowStdErrException(error, "cp", dest_str.c_str());
Expand Down
Loading