From a11f7535e6e69020b26631452ed1ad893055a0d0 Mon Sep 17 00:00:00 2001 From: Giuseppe Lo Presti Date: Mon, 14 Nov 2022 10:32:38 +0100 Subject: [PATCH] Fixed #3448 (#3455) --- changelog/unreleased/appprovider-panic-fix.md | 5 +++++ internal/grpc/services/appprovider/appprovider.go | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/appprovider-panic-fix.md diff --git a/changelog/unreleased/appprovider-panic-fix.md b/changelog/unreleased/appprovider-panic-fix.md new file mode 100644 index 0000000000..c0c4bfffcf --- /dev/null +++ b/changelog/unreleased/appprovider-panic-fix.md @@ -0,0 +1,5 @@ +Bugfix: Fixes panic in case of empty configuration + +Makes sure the config map is allocated prior to setting it + +https://github.com/cs3org/reva/pull/3455 diff --git a/internal/grpc/services/appprovider/appprovider.go b/internal/grpc/services/appprovider/appprovider.go index 9c209e8fb8..453fb8698c 100644 --- a/internal/grpc/services/appprovider/appprovider.go +++ b/internal/grpc/services/appprovider/appprovider.go @@ -200,8 +200,13 @@ func (s *service) Register(ss *grpc.Server) { func getProvider(c *config) (app.Provider, error) { if f, ok := registry.NewFuncs[c.Driver]; ok { driverConf := c.Drivers[c.Driver] - // share the mime_types config entry to the drivers - driverConf["mime_types"] = c.MimeTypes + if c.MimeTypes != nil { + // share the mime_types config entry to the drivers + if driverConf == nil { + driverConf = make(map[string]interface{}) + } + driverConf["mime_types"] = c.MimeTypes + } return f(driverConf) } return nil, errtypes.NotFound("driver not found: " + c.Driver)