Fix infinity loop issue (#127)

* Fix infinity loop issue * fix linter issues
aragon · Jun 3, 2022 · 5aff77c · 5aff77c
1 parent 8aef856
commit 5aff77c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/parser/index.js b/src/parser/index.js
@@ -369,6 +369,13 @@ export class Parser {
       }
     }
 
+    if (this.matches('COLON')) {
+      return {
+        type: 'StringLiteral',
+        value: null
+      }
+    }
+
     this.report(`Unknown token "${this.consume().type}"`)
   }
 
@@ -507,8 +514,22 @@ export class Parser {
 
       this.matches('TICK')
 
+      let loopDetectorCursor = 0
+      let loopDetector = false
       while (!this.eof() && this.peek().type !== 'TICK') {
         node.body.push(this.walk(node.body))
+        loopDetectorCursor++
+        if (loopDetectorCursor >= 10000) {
+          loopDetector = true
+          break
+        }
+      }
+
+      if (loopDetector) {
+        while (!this.eof() && this.peek().type !== 'TICK') {
+          this.cursor++
+        }
+        this.report('Infinite loop detected')
       }
 
       if (this.eof()) {

diff --git a/test/examples/examples.js b/test/examples/examples.js
@@ -739,6 +739,14 @@ const cases = [
     source: "`a == 0x0 ? 'concat ' + a : 'else'`",
     bindings: { a: address('0x0000000000000000000000000000000000000001') }
   }, 'else'],
+  [{
+    source: "`a : 'concat ' + a : 'else'`",
+    bindings: { a: address('0x0000000000000000000000000000000000000001') }
+  }, '0x0000000000000000000000000000000000000001'],
+  [{
+    source: "`a == 0x0 : 'concat ' + a : 'else'`",
+    bindings: { a: address('0x0000000000000000000000000000000000000001') }
+  }, 'false  concat 0x0000000000000000000000000000000000000001  else'],
 
   // External calls
   [{