Fix double-escaped paths on Windows #9814
Merged
Conversation
This file contains 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
sbc100
approved these changes
Nov 9, 2019
| @@ -808,8 +808,8 @@ def assertNotExists(self, filename, msg=None): | |||
|
|
|||
| # Tests that the given two paths are identical, modulo path delimiters. E.g. "C:/foo" is equal to "C:\foo". | |||
| def assertPathsIdentical(self, path1, path2): | |||
| path1 = path1.replace('\\', '/').replace('//', '/') | |||
| path2 = path2.replace('\\', '/').replace('//', '/') | |||
There was a problem hiding this comment.
I'm not totally sure about this.. but if not tests fail then I guess its fine.
There was a problem hiding this comment.
As I said in the description, this is what was hiding the problem in the first place - assertPathsIdentical shouldn't fix double-slashes itself, as real consumers also wouldn't.
On Windows, paths are using \, which is escaped to \\ by llvm-dwarfdump in its output. We need to unescape them before passing to source map encoder, as otherwise we end up with invalid paths and URLs that can't be resolved. This wasn't caught before, because assertPathsIdentical was performing its own unescaping before comparing paths, which is not what happens in real source map consumers. Fixes emscripten-core#9811.
RReverser
force-pushed
the
fix-sm-paths
branch
from
8f3cb8e to
aa78e1e
Compare
|
lgtm too, thanks @RReverser! Is this ready to merge, or was there something more to look into here? |
|
Yes, this is ready to merge - the other issue is completely separate. |
|
Thanks, merging! I'd like to look at the other issue that you noticed, but I don't remember what it was, was that filed? |
belraquib
pushed a commit
to belraquib/emscripten
that referenced
this pull request
Dec 23, 2020
On Windows, paths are using \, which is escaped to \\ by llvm-dwarfdump in its output. We need to unescape them before passing to source map encoder, as otherwise we end up with invalid paths and URLs that can't be resolved. This wasn't caught before, because assertPathsIdentical was performing its own unescaping before comparing paths, which is not what happens in real source map consumers. Fixes emscripten-core#9811.
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.
On Windows, paths are using
\, which is escaped to\\by llvm-dwarfdump in its output.We need to unescape them before passing to source map encoder, as otherwise we end up with invalid paths and URLs that can't be resolved.
This wasn't caught before, because
assertPathsIdenticalwas performing its own unescaping before comparing paths, which is not what happens in real source map consumers.Fixes #9811.