jettero/pcre
1
0
Fork 0
forked from Elara6331/pcre
Code Pull Requests Activity

Fix panic when pcre2 returns PCRE2_UNSET

Browse Source
This commit is contained in:
Elara 2023-07-25 23:35:29 -06:00
parent d1b9df80a1
commit 6d906d55a6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcre.go
View File

@ -8,6 +8,7 @@
package pcre package pcre
import ( import (
"math"
"os" "os"
"runtime" "runtime"
"strconv" "strconv"
@ -19,6 +20,8 @@ import (
"modernc.org/libc" "modernc.org/libc"
) )
const Unset = math.MaxUint
// Version returns the version of pcre2 embedded in this library. // Version returns the version of pcre2 embedded in this library.
func Version() string { return lib.DPACKAGE_VERSION } func Version() string { return lib.DPACKAGE_VERSION }
@ -208,7 +211,11 @@ func (r *Regexp) FindSubmatch(b []byte) [][]byte {
out := make([][]byte, 0, len(match)/2) out := make([][]byte, 0, len(match)/2)
for i := 0; i < len(match); i += 2 { for i := 0; i < len(match); i += 2 {
out = append(out, b[match[i]:match[i+1]]) if match[i] == Unset {
out = append(out, nil)
} else {
out = append(out, b[match[i]:match[i+1]])
}
} }
return out return out
} }
@ -253,7 +260,11 @@ func (r *Regexp) FindAllSubmatch(b []byte, n int) [][][]byte {
outMatch := make([][]byte, 0, len(match)/2) outMatch := make([][]byte, 0, len(match)/2)
for i := 0; i < len(match); i += 2 { for i := 0; i < len(match); i += 2 {
outMatch = append(outMatch, b[match[i]:match[i+1]]) if match[i] == Unset {
outMatch = append(outMatch, nil)
} else {
outMatch = append(outMatch, b[match[i]:match[i+1]])
}
} }
out[index] = outMatch out[index] = outMatch