fix panic when expiry is unset

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
cs3org · Jun 7, 2023 · fa09a8e · fa09a8e
1 parent 37f14fb
commit fa09a8e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/share/share.go b/pkg/share/share.go
@@ -242,6 +242,9 @@ func FilterFiltersByType(f []*collaboration.Filter, t collaboration.Filter_Type)
 
 // IsExpired tests whether a share is expired
 func IsExpired(s *collaboration.Share) bool {
-	expiration := time.Unix(int64(s.Expiration.GetSeconds()), int64(s.Expiration.GetNanos()))
-	return s.Expiration != nil && expiration.Before(time.Now())
+	if e := s.GetExpiration(); e != nil {
+		expiration := time.Unix(int64(e.Seconds), int64(e.Nanos))
+		return expiration.Before(time.Now())
+	}
+	return false
 }