Skip to content

fix(security): 2 improvements across 2 files #1673

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
tomaioo wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −1
Open

fix(security): 2 improvements across 2 files #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb84b61
fix(security): 2 improvements across 2 files
tomaioo Apr 25, 2026
011d38d
fix(security): 2 improvements across 2 files
tomaioo Apr 25, 2026
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
2 changes: 1 addition & 1 deletion base/iox/imagex/base64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func Base64SplitLines(b []byte) []byte {

// FromBase64 returns image from Base64-encoded bytes
func FromBase64(eb []byte) (image.Image, Formats, error) {
if eb[76] == ' ' {
if len(eb) > 76 && eb[76] == ' ' {
eb = bytes.ReplaceAll(eb, []byte(" "), []byte("\n"))
}
db := make([]byte, base64.StdEncoding.DecodedLen(len(eb)))
Expand Down
5 changes: 5 additions & 0 deletions cmd/changed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
func Changed(c *config.Config) error { //types:add
wg := sync.WaitGroup{}
errs := []error{}
errMu := sync.Mutex{}
fs.WalkDir(os.DirFS("."), ".", func(path string, d fs.DirEntry, err error) error {
wg.Add(1)
go func() {
Expand All @@ -33,7 +34,9 @@ func Changed(c *config.Config) error { //types:add
dir := filepath.Dir(path)
out, err := exec.Major().SetDir(dir).Output("git", "diff")
if err != nil {
errMu.Lock()
errs = append(errs, fmt.Errorf("error getting diff of %q: %w", dir, err))
errMu.Unlock()
return
}
if out != "" { // if we have a diff, we have been changed
Expand All @@ -43,7 +46,9 @@ func Changed(c *config.Config) error { //types:add
// if we don't have a diff, we also check to make sure we aren't ahead of the remote
out, err = exec.Minor().SetDir(dir).Output("git", "status")
if err != nil {
errMu.Lock()
errs = append(errs, fmt.Errorf("error getting status of %q: %w", dir, err))
errMu.Unlock()
return
}
if strings.Contains(out, "Your branch is ahead") { // if we are ahead, we have been changed
Expand Down