github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10133 from AkihiroSuda/fix-10062

Browse Source 
cri: introspectRuntimeFeatures: fix nil panic
This commit is contained in:
Akihiro Suda 2024-04-25 08:28:09 +00:00 committed by GitHub
commit 0426e3c2eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/cri/server/service.go
View File

@ -409,9 +409,11 @@ func introspectRuntimeFeatures(ctx context.Context, intro introspection.Service,
if err != nil { if err != nil {
return nil, err return nil, err
} }
rr.Options, err = protobuf.MarshalAnyToProto(options) if options != nil {
if err != nil { rr.Options, err = protobuf.MarshalAnyToProto(options)
return nil, fmt.Errorf("failed to marshal %T: %w", options, err) if err != nil {
return nil, fmt.Errorf("failed to marshal %T: %w", options, err)
}
} }
infoResp, err := intro.PluginInfo(ctx, string(plugins.RuntimePluginV2), "task", rr) infoResp, err := intro.PluginInfo(ctx, string(plugins.RuntimePluginV2), "task", rr)