Fix path resolution for symlinks #23072
Merged
Conversation
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
If `/a/link` is a symlink to directory `/b/c` then `/a/link/..` should be resolved to `/b/c/..` which is `/b`. Currently, we cancel out `link/..` to get `/a`. The problem is that we apply `PATH_FS.resolve` and `PATH_FS.normalize` to paths. These functions cancel `..` incorrectly. This at least partially handles the situation. `lookupPath` is modified to avoid calls that call `PATH_FS.normalize()`. We check that `mkdir`, `open`, and `stat` now work correctly.
sbc100
reviewed
Dec 5, 2024
src/library_syscall.js
Outdated
| if (!dir.endsWith("/")) { | ||
| dir += "/" | ||
| } | ||
| return dir + path; |
There was a problem hiding this comment.
How is this different to the old code?
There was a problem hiding this comment.
join2 calls normalize which will incorrectly replace /a/b/.. with /a.
There was a problem hiding this comment.
How about just return dir + '/' + path ? Or return '${dir}/${path}'?
There was a problem hiding this comment.
That'll probably work fine, I put it in and will let the CI say.
sbc100
reviewed
Dec 5, 2024
sbc100
approved these changes
Dec 6, 2024
dschuff
added a commit
to dschuff/emscripten
that referenced
this pull request
Dec 6, 2024
hedwigz
pushed a commit
to hedwigz/emscripten
that referenced
this pull request
Dec 18, 2024
If `/a/link` is a symlink to directory `/b/c` then `/a/link/..` should be resolved to `/b/c/..` which is `/b`. Currently, we cancel out `link/..` to get `/a`. The problem is that we apply `PATH_FS.resolve` and `PATH_FS.normalize` to paths. These functions cancel `..` incorrectly. This at least partially handles the situation. `lookupPath` is modified to avoid calls that call `PATH_FS.normalize()`. We check that `mkdir`, `open`, `stat`, `truncate`, and `chmod` now work correctly.
hedwigz
pushed a commit
to hedwigz/emscripten
that referenced
this pull request
Dec 18, 2024
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.
If
/a/linkis a symlink to directory/b/cthen/a/link/..should be resolved to/b/c/..which is/b. Currently, we cancel outlink/..to get/a. The problem is that we applyPATH_FS.resolveandPATH_FS.normalizeto paths. These functions cancel..incorrectly.This at least partially handles the situation.
lookupPathis modified to avoid calls that callPATH_FS.normalize(). We check thatmkdir,open,stat,truncate, andchmodnow work correctly.