[vcpkg] Do not use raw paths inside regexes #12964
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
vcpkg_fixup_pkgconfig uses raw paths in regexes in a couple of places. This causes problems if the path contains characters with special meaning for regexes (e.g. /home/hypothetical-user/Documents/C++).
|
Related issue: #12965 |
NancyLi1013
changed the title
PhoebeHui
added
the
category:vcpkg-bug
|
macos geogram failure didn't repro for me locally, merged with master to try to fix |
PhoebeHui
reviewed
Aug 19, 2020
| @@ -0,0 +1,4 @@ | |||
| function(vcpkg_escape_regex_control_characters out_var string_with_regex_characters) | |||
| string(REGEX REPLACE "([][+.*()^\\])" "\\\\\\1" _vercc_out "${string_with_regex_characters}") | |||
There was a problem hiding this comment.
Should we add '$' '?' '|' here?
…criptive variable name.
BillyONeal
approved these changes
Aug 21, 2020
There was a problem hiding this comment.
@hanst99 Can you confirm that you are OK with my edit? (Will merge ASAP assuming you like it) Thanks for your contribution!
|
Thanks for your contribution! |
remz1337
pushed a commit
to remz1337/vcpkg
that referenced
this pull request
Aug 23, 2020
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
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.
vcpkg_fixup_pkgconfig uses raw paths in regexes in a couple of places. This causes problems if the path contains characters with special meaning for regexes, e.g. /home/hypothetical-user/Documents/C++, which would fail to compile as it's not a valid regex – causing any invocation of this script to fail if vcpkg is on such a path.