server: fix buffer release timing in processUnaryRPC (grpc#7998)

arjan-bal · Jan 22, 2025 · 7ff60df · 7ff60df
1 parent 54b3eb9
commit 7ff60df
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/server.go b/server.go
@@ -1360,8 +1360,16 @@ func (s *Server) processUnaryRPC(ctx context.Context, stream *transport.ServerSt
 		}
 		return err
 	}
-	defer d.Free()
+	freed := false
+	dataFree := func() {
+		if !freed {
+			d.Free()
+			freed = true
+		}
+	}
+	defer dataFree()
 	df := func(v any) error {
+		defer dataFree()
 		if err := s.getCodec(stream.ContentSubtype()).Unmarshal(d, v); err != nil {
 			return status.Errorf(codes.Internal, "grpc: error unmarshalling request: %v", err)
 		}