Fix unterminated RegExp groups.

Bugfix.
githubxuxin · Sep 20, 2012 · d683eae · d683eae
1 parent 559ca26
commit d683eae
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/lib/director/router.js b/lib/director/router.js
@@ -111,22 +111,25 @@ function regifyString(str, params) {
 //
 // ### Fix unterminated RegExp groups in routes.
 //
-function terminator(routes, delimiter) {
+function terminator(routes, delimiter, start, stop) {
   var last = 0,
       left = 0,
       right = 0,
+      start = (start || '(').toString(),
+      stop = (stop || ')').toString(),
       i;
 
   for (i = 0; i < routes.length; i++) {
     var chunk = routes[i];
-    if ((chunk.indexOf('(', last) > chunk.indexOf(')', last)) ||
-        (~chunk.indexOf('(', last) && !~chunk.indexOf(')', last)) ||
-        (!~chunk.indexOf('(', last) && ~chunk.indexOf(')', last))) {
 
-      left = chunk.indexOf('(', last);
-      right = chunk.indexOf(')', last);
+    if ((chunk.indexOf(start, last) > chunk.indexOf(stop, last)) ||
+        (~chunk.indexOf(start, last) && !~chunk.indexOf(stop, last)) ||
+        (!~chunk.indexOf(start, last) && ~chunk.indexOf(stop, last))) {
 
-      if (!~right) {
+      left = chunk.indexOf(start, last);
+      right = chunk.indexOf(stop, last);
+
+      if ((~left && !~right) || (!~left && ~right)) {
         var tmp = routes.slice(0, (i || 1) + 1).join(delimiter);
         routes = [tmp].concat(routes.slice((i || 1) + 1));
       }
@@ -771,6 +774,7 @@ Router.prototype.mount = function(routes, path) {
 
     if (isRoute) {
       local = local.concat(rename.split(self.delimiter));
+      local = terminator(local, self.delimiter);
     }
 
     self.insert(event, local, routes[route]);