Skip to content

Commit c498040

Browse files
authored
address codeQL issues (#14425)
1 parent 11df853 commit c498040

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

.github/actions/common/utils.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export const normalizeIssue = (issue: {
2525
const cleanse = (str: string) => {
2626
let out = str
2727
.toLowerCase()
28-
.replace(/<!--.*-->/gu, '')
2928
.replace(/.* version: .*/gu, '')
3029
.replace(/issue type: .*/gu, '')
3130
.replace(/vs ?code/gu, '')
@@ -36,6 +35,12 @@ export const normalizeIssue = (issue: {
3635
.replace(/\s+/gu, ' ')
3736
.replace(/```[^`]*?```/gu, '');
3837

38+
while (
39+
out.includes('<!--') &&
40+
out.includes('-->') &&
41+
out.indexOf('-->') > out.indexOf('<!--')) {
42+
out = out.slice(0, out.indexOf('<!--')) + out.slice(out.indexOf('-->') + 3);
43+
}
3944
while (
4045
out.includes(`<details>`) &&
4146
out.includes('</details>') &&
@@ -116,9 +121,9 @@ Repo: ${context.repo.owner}/${context.repo.repo}
116121
117122
<!-- Context:
118123
${JSON.stringify(context, null, 2)
119-
.replace(/<!--/gu, '<@--')
120-
.replace(/-->/gu, '--@>')
121-
.replace(/\/|\\/gu, 'slash-')}
124+
.replace(/<!--/gu, '<@--')
125+
.replace(/--!?\s*>/gu, '--@>')
126+
.replace(/\/|\\/gu, 'slash-')}
122127
-->
123128
`);
124129
};

0 commit comments

Comments
 (0)