Merge pull request #889 from zeitgeist87/FixRegexp

Fix catastrophic backtracking regex issues
PrismJS · Feb 12, 2016 · c1e75bd · c1e75bd
2 parents 99c30e4 + ab65be2
commit c1e75bd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/components/prism-bash.js b/components/prism-bash.js
@@ -47,7 +47,7 @@
 				inside: insideString
 			},
 			{
-				pattern: /("|')(?:\\?[\s\S])*?\1/g,
+				pattern: /(["'])(?:\\\\|\\?[^\\])*?\1/g,
 				inside: insideString
 			}
 		],

diff --git a/components/prism-bash.min.js b/components/prism-bash.min.js
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -14,7 +14,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 
 Prism.languages.insertBefore('javascript', 'class-name', {
 	'template-string': {
-		pattern: /`(?:\\`|\\?[^`])*`/,
+		pattern: /`(?:\\\\|\\?[^\\])*?`/,
 		inside: {
 			'interpolation': {
 				pattern: /\$\{[^}]+\}/,

diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/prism.js b/prism.js
@@ -605,7 +605,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 
 Prism.languages.insertBefore('javascript', 'class-name', {
 	'template-string': {
-		pattern: /`(?:\\`|\\?[^`])*`/,
+		pattern: /`(?:\\\\|\\?[^\\])*?`/,
 		inside: {
 			'interpolation': {
 				pattern: /\$\{[^}]+\}/,