mirror/otto
1
0
Fork 0
mirror of https://github.com/robertkrimen/otto synced 2025-10-05 19:19:10 +08:00
Code Issues Releases Wiki Activity

fix: missing regexp capture panic (#477)

Browse Source 
Fix RegExp panic when a capture doesn't match but the full expression
does.
This commit is contained in:
Steven Hartland 2022-12-05 22:51:22 +00:00 committed by GitHub
parent 233dfa4ef0
commit 898a889ed4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin_regexp.go
View File

@ -67,11 +67,17 @@ func builtinRegExpTest(call FunctionCall) Value {
var start int
n := 1
re := call.runtime.global.RegExp
empty := stringValue("")
for i, v := range result[2:] {
if i%2 == 0 {
start = v
} else {
re.defineProperty(fmt.Sprintf("$%d", n), stringValue(target[start:v]), 0o100, false)
if v == -1 {
// No match for this part.
re.defineProperty(fmt.Sprintf("$%d", n), empty, 0o100, false)
} else {
re.defineProperty(fmt.Sprintf("$%d", n), stringValue(target[start:v]), 0o100, false)
}
n++
if n == 10 {
break
@ -81,7 +87,6 @@ func builtinRegExpTest(call FunctionCall) Value {
if n <= 9 {
// Erase remaining.
empty := stringValue("")
for i := n; i <= 9; i++ {
re.defineProperty(fmt.Sprintf("$%d", i), empty, 0o100, false)
}

5
issue_test.go
View File

@ -1048,6 +1048,11 @@ func Test_issue317(t *testing.T) {
regexp: "(1+)-(2+)-(3+)-(4+)-(5+)-(6+)-(7+)-(8+)-(9+)-(X+)",
want: "",
},
"missing-match": {
input: "data:image/png;base64,",
regexp: "^data:(.*?)(;(.*?))??(;base64)?,",
want: "data:image/png;base64,,image/png,,,;base64,,,,,",
},
}
previous := ",,,,,,,,,"