src: avoid shadowed string in fs_permission - #51123
Merged
nodejs-github-bot merged 1 commit intoJan 3, 2024
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
|
Review requested:
|
Sorry, something went wrong.
RafaelGSS
approved these changes
Dec 11, 2023
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
anonrig
approved these changes
Dec 12, 2023
Comment thread
src/permission/fs_permission.h
Outdated
codebytere
force-pushed
the
copy-string-fix
branch
2 times, most recently
from
7161204 to
7d2c4c1
Compare
December 12, 2023 09:59
tniessen
approved these changes
Dec 12, 2023
Copy link
Copy Markdown
Member
Author
|
Seeing test failures that i didn't see when running Electron's version against Node.js tests - looking into it 🤔 |
Sorry, something went wrong.
RafaelGSS
requested changes
Dec 18, 2023
RafaelGSS
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
@codebytere this should fix your issue:
diff --git a/src/permission/fs_permission.h b/src/permission/fs_permission.h
index 4577a73c37d..642d2dbc6ea 100644
--- a/src/permission/fs_permission.h
+++ b/src/permission/fs_permission.h
@@ -43,7 +43,7 @@ class FSPermission final : public PermissionBase {
Node* child = children[label];
if (child == nullptr) {
- children[label] = new Node(prefix);
+ children[label] = new Node(path_prefix);
return children[label];
}
Sorry, something went wrong.
codebytere
force-pushed
the
copy-string-fix
branch
from
7d2c4c1 to
988b3ea
Compare
January 1, 2024 13:53
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
RafaelGSS
approved these changes
Jan 3, 2024
targos
pushed a commit
that referenced
this pull request
Feb 15, 2024
PR-URL: #51123 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Merged
richardlau
pushed a commit
that referenced
this pull request
Mar 25, 2024
PR-URL: #51123 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refs #44004
Addresses the following shadowing issue in fs_permission:
../../third_party/electron_node/src/permission/fs_permission.h:34:37: error: declaration shadows a field of 'node::permission::FSPermission::RadixTree::Node' [-Werror,-Wshadow] 34 | Node* CreateChild(std::string prefix) { | ^ ../../third_party/electron_node/src/permission/fs_permission.h:24:19: note: previous declaration is here 24 | std::string prefix; | ^ 1 error generated.Allows Electron to remove a patch.