Avoid using GNU extensions in the dependency splitter regex #1617
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
markjdb
added a commit
to markjdb/freebsd-ports
that referenced
this pull request
Aug 24, 2023
Our regex implementation doesn't implement \s or \S, so libdnf.so cannot be loaded as it throws an exception when RELDEP_REGEX is compiled. For instance, "dnf --version" simply aborts without printing anything. Submitted upstream as a pull request: rpm-software-management/libdnf#1617 Sponsored by: Klara, Inc.
m-blaha
reviewed
Aug 25, 2023
| @@ -29,7 +29,7 @@ | |||
| namespace libdnf { | |||
|
|
|||
| static const Regex RELDEP_REGEX = | |||
| Regex("^(\\S*)\\s*(<=|>=|<|>|=|==)?\\s*(\\S*)$", REG_EXTENDED); | |||
| Regex("^([^[:space:]]*)[[:space:]]*(<=|>=|<|>|=|==)?[[:space:]]*([^[:space:]]*)$", REG_EXTENDED); | |||
There was a problem hiding this comment.
Interesting. It's never come to my mind that there might be a compatibility problem with '\s'.
Does it make sense to leave a comment here? Just to remind future maintainers who might feel tempted to "simplify" the regex by putting \s back.
Would you mind filing a similar PR also for dnf5 (next generation of dnf)?
https://github.com/rpm-software-management/dnf5/blob/e2aa5eead7589e65994b2f971f63d5d64b88d421/libdnf5/solv/reldep_parser.cpp#L30
There was a problem hiding this comment.
Does it make sense to leave a comment here?
Sure, I updated the diff.
Would you mind filing a similar PR also for dnf5 (next generation of dnf)?
Certainly: rpm-software-management/dnf5#843
Sticking to POSIX-compatible extended regular expressions makes the code more portable. In particular, this change is required to avoid an abort at load time on FreeBSD. No functional change intended.
markjdb
force-pushed
the
freebsd-regex-compat
branch
from
196be80
to
810da5e
Compare
m-blaha
merged commit 31ed3e7
into
rpm-software-management:dnf-4-master
3 checks passed
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.
Sticking to POSIX-compatible extended regular expressions makes the code more portable. In particular, this change is required to avoid an abort at load time on FreeBSD.
No functional change intended.