Skip to content

coredump: use path.Join in the 'new' command #430

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

Merged
fabled merged 1 commit into from
Apr 6, 2025
Merged

coredump: use path.Join in the 'new' command #430

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
9 changes: 5 additions & 4 deletions tools/coredump/new.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"fmt"
"os"
"os/exec"
"path"
"strconv"

"github.com/peterbourgon/ff/v3/ffcli"
Expand Down Expand Up @@ -72,7 +73,7 @@ func (tc *trackedCoredump) warnMissing(fileName string) {

func (tc *trackedCoredump) CalculateMappingFileID(m *process.Mapping) (libpf.FileID, error) {
if !m.IsVDSO() && !m.IsAnonymous() {
fid, err := libpf.FileIDFromExecutableFile(tc.prefix + m.Path)
fid, err := libpf.FileIDFromExecutableFile(path.Join(tc.prefix, m.Path))
if err == nil {
tc.seen[m.Path] = libpf.Void{}
return fid, nil
Expand All @@ -84,7 +85,7 @@ func (tc *trackedCoredump) CalculateMappingFileID(m *process.Mapping) (libpf.Fil

func (tc *trackedCoredump) OpenMappingFile(m *process.Mapping) (process.ReadAtCloser, error) {
if !m.IsVDSO() && !m.IsAnonymous() {
rac, err := os.Open(tc.prefix + m.Path)
rac, err := os.Open(path.Join(tc.prefix, m.Path))
if err == nil {
tc.seen[m.Path] = libpf.Void{}
return rac, nil
Expand All @@ -96,7 +97,7 @@ func (tc *trackedCoredump) OpenMappingFile(m *process.Mapping) (process.ReadAtCl

func (tc *trackedCoredump) OpenELF(fileName string) (*pfelf.File, error) {
if fileName != process.VdsoPathName {
f, err := pfelf.Open(tc.prefix + fileName)
f, err := pfelf.Open(path.Join(tc.prefix, fileName))
if err == nil {
tc.seen[fileName] = libpf.Void{}
return f, err
Expand All @@ -107,7 +108,7 @@ func (tc *trackedCoredump) OpenELF(fileName string) (*pfelf.File, error) {
}

func (tc *trackedCoredump) ExtractAsFile(fileName string) (string, error) {
prefixedFileName := tc.prefix + fileName
prefixedFileName := path.Join(tc.prefix, fileName)
if _, err := os.Stat(prefixedFileName); err != nil {
tc.warnMissing(fileName)
return "", err
Expand Down