Skip to content

internal/trace/raw: use strings.Cut instead of strings.SplitN 2 #75257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −8
Open

internal/trace/raw: use strings.Cut instead of strings.SplitN 2 #75257

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/internal/trace/raw/textreader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,13 @@ func readArg(s string) (arg string, value uint64, rest string, err error) {
if len(tok) == 0 {
return "", 0, s, fmt.Errorf("no argument")
}
parts := strings.SplitN(tok, "=", 2)
if len(parts) < 2 {
arg, val, found := strings.Cut(tok, "=")
if !found {
return "", 0, s, fmt.Errorf("malformed argument: %q", tok)
}
arg = parts[0]
value, err = strconv.ParseUint(parts[1], 10, 64)
value, err = strconv.ParseUint(val, 10, 64)
if err != nil {
return arg, value, s, fmt.Errorf("failed to parse argument value %q for arg %q", parts[1], parts[0])
return arg, value, s, fmt.Errorf("failed to parse argument value %q for arg %q", val, arg)
}
return
}
Expand Down Expand Up @@ -205,11 +204,11 @@ func readToken(s string) (token, rest string) {
}

func readData(line string) ([]byte, error) {
parts := strings.SplitN(line, "=", 2)
if len(parts) < 2 || strings.TrimSpace(parts[0]) != "data" {
dk, dv, found := strings.Cut(line, "=")
if !found || strings.TrimSpace(dk) != "data" {
return nil, fmt.Errorf("malformed data: %q", line)
}
data, err := strconv.Unquote(strings.TrimSpace(parts[1]))
data, err := strconv.Unquote(strings.TrimSpace(dv))
if err != nil {
return nil, fmt.Errorf("failed to parse data: %q: %v", line, err)
}
Expand Down