Merge pull request containerd#10133 from AkihiroSuda/fix-10062

AkihiroSuda · web-flow · commit 0426e3c2eb39 · 2024-04-25T08:28:09.000Z
cri: introspectRuntimeFeatures: fix nil panic
diff --git a/internal/cri/server/service.go b/internal/cri/server/service.go
@@ -409,9 +409,11 @@ func introspectRuntimeFeatures(ctx context.Context, intro introspection.Service,
 	if err != nil {
 		return nil, err
 	}
-	rr.Options, err = protobuf.MarshalAnyToProto(options)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal %T: %w", options, err)
+	if options != nil {
+		rr.Options, err = protobuf.MarshalAnyToProto(options)
+		if err != nil {
+			return nil, fmt.Errorf("failed to marshal %T: %w", options, err)
+		}
 	}
 
 	infoResp, err := intro.PluginInfo(ctx, string(plugins.RuntimePluginV2), "task", rr)

Original file line number	Diff line number	Diff line change
`@@ -409,9 +409,11 @@ func introspectRuntimeFeatures(ctx context.Context, intro introspection.Service,`
`409`	`409`	`if err != nil {`
`410`	`410`	`return nil, err`
`411`	`411`	`}`
`412`		`- rr.Options, err = protobuf.MarshalAnyToProto(options)`
`413`		`- if err != nil {`
`414`		`- return nil, fmt.Errorf("failed to marshal %T: %w", options, err)`
	`412`	`+ if options != nil {`
	`413`	`+ rr.Options, err = protobuf.MarshalAnyToProto(options)`
	`414`	`+ if err != nil {`
	`415`	`+ return nil, fmt.Errorf("failed to marshal %T: %w", options, err)`
	`416`	`+ }`
`415`	`417`	`}`
`416`	`418`
`417`	`419`	`infoResp, err := intro.PluginInfo(ctx, string(plugins.RuntimePluginV2), "task", rr)`