diff options
| author | NIIBE Yutaka <[email protected]> | 2017-11-09 05:03:22 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-12-04 10:34:43 +0000 |
| commit | 9ba0e2c76c0c040e69e50ed9d89eadb3269052f9 (patch) | |
| tree | 9e01cae20d189182908329d5d7b15a7501de9623 | |
| parent | gpgsm: Allow ciphers AES192 and SERPENT256 (diff) | |
| download | gnupg-9ba0e2c76c0c040e69e50ed9d89eadb3269052f9.tar.gz gnupg-9ba0e2c76c0c040e69e50ed9d89eadb3269052f9.zip | |
g10: Fix regexp sanitization.
* g10/trustdb.c (sanitize_regexp): Only escape operators.
--
Backport from master commit:
ccf3ba92087e79abdeaa0208795829b431c6f201
To sanitize a regular expression, quoting by backslash should be only
done for defined characters. POSIX defines 12 characters including
dot and backslash.
Quoting other characters is wrong, in two ways; It may build an
operator like: \b, \s, \w when using GNU library. Case ignored match
doesn't work, because quoting lower letter means literally and no
much to upper letter.
GnuPG-bug-id: 2923
Co-authored-by: Damien Goutte-Gattat <[email protected]>
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | g10/trustdb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index c9c88913b..bc90161e9 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1823,6 +1823,10 @@ clean_key(KBNODE keyblock,int noisy,int self_only, /* Returns a sanitized copy of the regexp (which might be "", but not NULL). */ #ifndef DISABLE_REGEX +/* Operator charactors except '.' and backslash. + See regex(7) on BSD. */ +#define REGEXP_OPERATOR_CHARS "^[$()|*+?{" + static char * sanitize_regexp(const char *old) { @@ -1862,7 +1866,7 @@ sanitize_regexp(const char *old) { if(!escaped && old[start]=='\\') escaped=1; - else if(!escaped && old[start]!='.') + else if (!escaped && strchr (REGEXP_OPERATOR_CHARS, old[start])) new[idx++]='\\'; else escaped=0; |