Merge pull request #834 from mackerelio/fix-check-log-nil-ptr

ne-sachirou · web-flow · commit bfe4a9d46bfa · 2024-04-15T14:04:16.000+09:00
Fix: check-log panic with invalid memory address or nil pointer dereference
diff --git a/check-log/lib/check-log.go b/check-log/lib/check-log.go
@@ -571,6 +571,9 @@ func findFileByInode(inode uint, dir string) (string, error) {
 		if err != nil && !errors.Is(err, os.ErrNotExist) {
 			return "", err
 		}
+		if fi == nil {
+			continue
+		}
 		if detectInode(fi) == inode {
 			return filepath.Join(dir, fi.Name()), nil
 		}

Original file line number	Diff line number	Diff line change
`@@ -571,6 +571,9 @@ func findFileByInode(inode uint, dir string) (string, error) {`
`571`	`571`	`if err != nil && !errors.Is(err, os.ErrNotExist) {`
`572`	`572`	`return "", err`
`573`	`573`	`}`
	`574`	`+ if fi == nil {`
	`575`	`+ continue`
	`576`	`+ }`
`574`	`577`	`if detectInode(fi) == inode {`
`575`	`578`	`return filepath.Join(dir, fi.Name()), nil`
`576`	`579`	`}`