fix possible nil pointer exception (cs3org#2558)

butonic · Feb 16, 2022 · 67204fe · 67204fe
1 parent a765314
commit 67204fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/changelog/unreleased/remove-base64-encoding-of-ids.md b/changelog/unreleased/remove-base64-encoding-of-ids.md
@@ -3,3 +3,4 @@ Change: Do not encode webDAV ids to base64
 We removed the base64 encoding of the IDs and use the format <storageID>!<opaqueID> with a `!` delimiter. As a reserved delimiter it is URL safe. The IDs will be XML and JSON encoded as necessary.
 
 https://github.com/cs3org/reva/pull/2542
+https://github.com/cs3org/reva/pull/2558
diff --git a/pkg/storage/utils/decomposedfs/spaces.go b/pkg/storage/utils/decomposedfs/spaces.go
@@ -419,10 +419,20 @@ func (fs *Decomposedfs) UpdateStorageSpace(ctx context.Context, req *provider.Up
 		}
 		if image, ok := space.Opaque.Map["image"]; ok {
 			imageID := resourceid.OwnCloudResourceIDUnwrap(string(image.Value))
+			if imageID == nil {
+				return &provider.UpdateStorageSpaceResponse{
+					Status: &v1beta11.Status{Code: v1beta11.Code_CODE_NOT_FOUND, Message: "decomposedFS: space image resource not found"},
+				}, nil
+			}
 			metadata[xattrs.SpaceImageAttr] = imageID.OpaqueId
 		}
 		if readme, ok := space.Opaque.Map["readme"]; ok {
 			readmeID := resourceid.OwnCloudResourceIDUnwrap(string(readme.Value))
+			if readmeID == nil {
+				return &provider.UpdateStorageSpaceResponse{
+					Status: &v1beta11.Status{Code: v1beta11.Code_CODE_NOT_FOUND, Message: "decomposedFS: space readme resource not found"},
+				}, nil
+			}
 			metadata[xattrs.SpaceReadmeAttr] = readmeID.OpaqueId
 		}
 	}