diff options
| author | Jeffrey Vander Stoep <jeffv@google.com> | 2015-04-07 20:57:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-07 20:57:30 +0000 |
| commit | 3978a33242e150061365a33311e1b09c223e1011 (patch) | |
| tree | 3725db17950fb8676e8a81a02f7b08cfa26c7264 | |
| parent | 14170b5ed9f0fc06e0398ae07f369a8d25a734b2 (diff) | |
| parent | 8edab60d7dd8485ccb4b5c9b9e8fe4e8d6daf939 (diff) | |
| download | checkpolicy-3978a33242e150061365a33311e1b09c223e1011.tar.gz | |
Merge "checkpolicy: Fix precedence between number and filesystem tokens."
| -rw-r--r-- | policy_scan.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy_scan.l b/policy_scan.l index 3a73962..648e1d6 100644 --- a/policy_scan.l +++ b/policy_scan.l @@ -242,8 +242,8 @@ LOW { return(LOW); } "/"({alnum}|[_\.\-/])* { return(PATH); } \"({alnum}|[_\.\-\+\~\: ])+\" { return(FILENAME); } {letter}({alnum}|[_\-])*([\.]?({alnum}|[_\-]))* { return(IDENTIFIER); } -{alnum}*{letter}{alnum}* { return(FILESYSTEM); } {digit}+|0x{hexval}+ { return(NUMBER); } +{alnum}*{letter}{alnum}* { return(FILESYSTEM); } {digit}{1,3}(\.{digit}{1,3}){3} { return(IPV4_ADDR); } {hexval}{0,4}":"{hexval}{0,4}":"({hexval}|[:.])* { return(IPV6_ADDR); } {digit}+(\.({alnum}|[_.])*)? { return(VERSION_IDENTIFIER); } |