Merge pull request #337 from canjs/336-fix-runaway-regexp

imaustink · web-flow · commit a31f8d063df5 · 2017-06-21T10:47:16.000-07:00
Fix catastrophic backtracking ReqExp. Closes #336
diff --git a/static/canjs.js b/static/canjs.js
@@ -194,7 +194,7 @@ function navigate(href) {
 			ga('send', 'pageview', window.location.pathname);
 
 			// set new content
-			var $content = $(content.match(/<body>(\r|\n|.)+<\/body>/g)[0]);
+			var $content = $(content.match(/<body.*?>[\s\S]+<\/body>/g)[0]);
 			if (!$content.length) {
 				window.location.reload();
 			}

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ function navigate(href) {`
`194`	`194`	`ga('send', 'pageview', window.location.pathname);`
`195`	`195`
`196`	`196`	`// set new content`
`197`		`- var $content = $(content.match(/<body>(\r\|\n\|.)+<\/body>/g)[0]);`
	`197`	`+ var $content = $(content.match(/<body.*?>[\s\S]+<\/body>/g)[0]);`
`198`	`198`	`if (!$content.length) {`
`199`	`199`	`window.location.reload();`
`200`	`200`	`}`