Fix blank lines being left over when hiding code lines

oguzhalit · Mar 4, 2021 · 47de752 · 47de752
1 parent 52c396f
commit 47de752
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/routes/vulnCodeSnippet.js b/routes/vulnCodeSnippet.js
@@ -21,10 +21,10 @@ module.exports = function serveCodeSnippet () {
  let snippet = source.match(`// vuln-code-snippet start.*${challenge.key}(.|\\r\\n|\\n|\\r)*vuln-code-snippet end.*${challenge.key}`)
  if (snippet) {
  snippet = snippet[0] // TODO Currently only a single code snippet is supported
- snippet = snippet.replace(/\/\/ vuln-code-snippet start.*/g, '')
+ snippet = snippet.replace(/\/\/ vuln-code-snippet start.*(\r\n|\n|\r)?/g, '')
  snippet = snippet.replace(/\/\/ vuln-code-snippet end.*/g, '')
- snippet = snippet.replace(/.*\/\/ vuln-code-snippet hide-line/g, '')
- snippet = snippet.replace(/.*\/\/ vuln-code-snippet hide-start(.|\r\n|\n|\r)*\/\/ vuln-code-snippet hide-end/g, '')
+ snippet = snippet.replace(/.*\/\/ vuln-code-snippet hide-line(\r\n|\n|\r)?/g, '')
+ snippet = snippet.replace(/.*\/\/ vuln-code-snippet hide-start(.|\r\n|\n|\r)*\/\/ vuln-code-snippet hide-end(\r\n|\n|\r)?/g, '')
  snippet = snippet.trim()
 
  let lines = snippet.split('\r\n')