Detect unterminated regex when EOF reached

influxdata · Jul 12, 2016 · 3bd61c8 · 3bd61c8
1 parent d048501
commit 3bd61c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Bugfixes
 
+- [#710](https://github.com/influxdata/kapacitor/pull/662): Fix infinite loop when parsing unterminated regex in TICKscript.
+
 ## v1.0.0-beta3 [2016-07-09]
 
 ### Release Notes

diff --git a/tick/ast/lex.go b/tick/ast/lex.go
@@ -577,6 +577,8 @@ func lexRegex(l *lexer) stateFn {
 		case r == '/':
 			l.emit(TokenRegex)
 			return lexToken
+		case r == eof:
+			return l.errorf("unterminated regex")
 		default:
 			//absorb
 		}