grim/convey

Harden regex for ${var}.
expand-list
2017-10-03, Eric Fritz
ee97ff3b6550
Parents 1f100c6c13ec
Children 3263ee6583bd345a52ef04c6
Harden regex for ${var}.
1 files changed, 2 insertions(+), 2 deletions(-)
  • +2 -2
    state/util.go
    • --- a/state/util.go Tue Oct 03 22:13:07 2017 -0500
    +++ b/state/util.go Tue Oct 03 22:17:51 2017 -0500
    @@ -21,8 +21,8 @@
    "regexp"
    )
    -var re1 = regexp.MustCompile("\\$[A-Za-z0-9_]+")
    -var re2 = regexp.MustCompile("\\${[A-Za-z0-9_]+}")
    +var re1 = regexp.MustCompile("\\$[A-Za-z_][A-Za-z0-9_]*")
    +var re2 = regexp.MustCompile("\\${[A-Za-z_][A-Za-z0-9_]*}")
    // getNames extracts all variables with the format $var or ${var} from
    // the given string.