From b5f1cf80a58d74fe03c932d7a7bba96143bdeba3 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 6 Mar 2020 12:32:30 -0800 Subject: [PATCH 1/2] Fix nil pointer dereference on error --- test/integration/none_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/integration/none_test.go b/test/integration/none_test.go index c0c822849b..95e27fd91c 100644 --- a/test/integration/none_test.go +++ b/test/integration/none_test.go @@ -81,6 +81,11 @@ func TestChangeNoneUser(t *testing.T) { info, err := os.Stat(p) if err != nil { t.Errorf("stat(%s): %v", p, err) + continue + } + if info == nil && info.Sys() == nil { + t.Errorf("nil info for %s", p) + continue } got := info.Sys().(*syscall.Stat_t).Uid if got != uint32(uid) { From 318f9f2b7590ecbbf4813afbe89dfd67eb09ece0 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 6 Mar 2020 12:48:54 -0800 Subject: [PATCH 2/2] Flip boolean logic --- test/integration/none_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/none_test.go b/test/integration/none_test.go index 95e27fd91c..e95468f86c 100644 --- a/test/integration/none_test.go +++ b/test/integration/none_test.go @@ -83,7 +83,7 @@ func TestChangeNoneUser(t *testing.T) { t.Errorf("stat(%s): %v", p, err) continue } - if info == nil && info.Sys() == nil { + if info == nil || info.Sys() == nil { t.Errorf("nil info for %s", p) continue }