Fix slice out of bounds in fsutil.CleanPath (#517)

Fixes #515
gopasspw · Dec 13, 2017 · 1739e13 · 1739e13
1 parent bf43874
commit 1739e13
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/utils/fsutil/fsutil.go b/utils/fsutil/fsutil.go
@@ -24,7 +24,7 @@ func CleanPath(path string) string {
 		}
 	}
 	// http://stackoverflow.com/questions/17609732/expand-tilde-to-home-directory
-	if path[:2] == "~/" {
+	if len(path) > 1 && path[:2] == "~/" {
 		usr, _ := user.Current()
 		dir := usr.HomeDir
 		path = strings.Replace(path, "~/", dir+"/", 1)

diff --git a/utils/fsutil/fsutil_test.go b/utils/fsutil/fsutil_test.go
@@ -11,6 +11,7 @@ import (
 
 func TestCleanPath(t *testing.T) {
 	m := map[string]string{
+		".": "",
 		"/home/user/../bob/.password-store": "/home/bob/.password-store",
 		"/home/user//.password-store":       "/home/user/.password-store",
 	}

diff --git a/utils/notify/notify_darwin.go b/utils/notify/notify_darwin.go
@@ -12,7 +12,7 @@ func Notify(subj, msg string) error {
 	}
 
 	return exec.Command(
-		osa,
+		osas,
 		"-e",
 		`display notification "`+msg+`" with title "`+subj+`"`,
 	).Start()
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ func Notify(subj, msg string) error { @@
     	}
     	return exec.Command(
-    		osa,
+    		osas,
     		"-e",
     		`display notification "`+msg+`" with title "`+subj+`"`,
     	).Start()
@@ Expand Down @@