Merge pull request #4856 from 2403905/pr4855

fix the nil pointer
cs3org · Sep 19, 2024 · 5562631 · 5562631
2 parents 4849435 + 4f3854a
commit 5562631
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/changelog/unreleased/fix-time-convertion.md b/changelog/unreleased/fix-time-convertion.md
@@ -0,0 +1,5 @@
+Bugfix: Fix time conversion
+
+We fixed a nil pointer in a time conversion
+
+https://github.com/cs3org/reva/pull/4856
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -146,6 +146,9 @@ func TSToUnixNano(ts *types.Timestamp) uint64 {
 
 // TSToTime converts a protobuf Timestamp to Go's time.Time.
 func TSToTime(ts *types.Timestamp) time.Time {
+	if ts == nil {
+		return time.Time{}
+	}
 	return time.Unix(int64(ts.Seconds), int64(ts.Nanos))
 }