fs,win: do not add a second trailing slash in readdir · nodejs/node@993f05d · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 748
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 993f05d

Browse filesBrowse the repository at this point in the historyBrowse files

Flarna

authored and

targos

committed

fs,win: do not add a second trailing slash in readdir

Do not add a trailing slash if it was not removed by resolve in ToNamespacedPath. PR-URL: #59847 Fixes: #58223 Refs: #56110 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>

1 parent ac78491 commit 993f05d
Copy full SHA for 993f05d

1 file changed

+1-1Lines changed: 1 addition & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • node_file.cc

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/node_file.cc‎

Copy file name to clipboardExpand all lines: src/node_file.cc

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1994,7 +1994,7 @@ static void ReadDir(const FunctionCallbackInfo<Value>& args) {
1994	1994	ToNamespacedPath(env, &path);
1995	1995
1996	1996	#ifdef _WIN32
1997		- if (slashCheck) {
	1997	+ if (slashCheck && !path.ToStringView().ends_with("\\")) {
1998	1998	size_t new_length = path.length() + 1;
1999	1999	path.AllocateSufficientStorage(new_length + 1);
2000	2000	path.SetLengthAndZeroTerminate(new_length);

0 commit comments

Comments

0 (0)