Harden pgfmathparser against active chars #1221
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
In general, the grabbed token could always be active, so precautions are needed. Signed-off-by: Joseph Wright <joseph.wright@morningstar2.co.uk>
Signed-off-by: Joseph Wright <joseph.wright@morningstar2.co.uk>
josephwright
force-pushed
the
active-safe
branch
from
0354954
to
9b09656
Compare
Signed-off-by: Joseph Wright <joseph.wright@morningstar2.co.uk>
|
Looks good, thanks! Could you please add a few tests? |
I'll work on it: the tests I have locally also depend on another patch that's a bit harder to articulate just yet. Later today ... |
muzimuzhi
requested changes
Dec 1, 2022
| % ...or a base prefix... | ||
| \expandafter\ifx\csname pgfmath@base@\pgfmath@number\pgfmath@token\endcsname\relax% | ||
| \expandafter\ifx\csname pgfmath@base@\expandafter\pgfmath@number\expandafter\string\pgfmath@token\endcsname\relax% |
There was a problem hiding this comment.
Suggested change
| \expandafter\ifx\csname pgfmath@base@\expandafter\pgfmath@number\expandafter\string\pgfmath@token\endcsname\relax% | |
| \expandafter\ifx\csname pgfmath@base@\pgfmath@number\expandafter\string\pgfmath@token\endcsname\relax% |
It seems the first added \expandafter is unnecessary.
| @@ -509,7 +509,7 @@ | |||
| \else% | |||
| % ...here, it is a base prefix 0x, 0X, 0b or 0B | |||
| \expandafter\let\expandafter\pgfmath@base\expandafter=% | |||
| \csname pgfmath@base@\pgfmath@number\pgfmath@token\endcsname% | |||
| \csname pgfmath@base@\expandafter\pgfmath@number\expandafter\string\pgfmath@token\endcsname% | |||
There was a problem hiding this comment.
Suggested change
| \csname pgfmath@base@\expandafter\pgfmath@number\expandafter\string\pgfmath@token\endcsname% | |
| \csname pgfmath@base@\pgfmath@number\expandafter\string\pgfmath@token\endcsname% |
hmenke
approved these changes
Oct 23, 2023
muzimuzhi
added a commit
that referenced
this pull request
Oct 23, 2023
Signed-off-by: muzimuzhi <muzimuzhi@gmail.com>
loopspace
pushed a commit
to loopspace/pgf
that referenced
this pull request
Apr 2, 2024
Signed-off-by: muzimuzhi <muzimuzhi@gmail.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.
In general, the grabbed token could always be active, so precautions are needed. Here, the places that the grabbed token is tested and those where it's used in a csname are addressed. The tests need \noexpand, the csname usage \string, with appropriate expansion.