chore: update dependencies
This commit is contained in:
		
							
								
								
									
										7
									
								
								vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -440,6 +440,13 @@ func legacyMerge(in piface.MergeInput) piface.MergeOutput {
 | 
			
		||||
	if !ok {
 | 
			
		||||
		return piface.MergeOutput{}
 | 
			
		||||
	}
 | 
			
		||||
	if !in.Source.IsValid() {
 | 
			
		||||
		// Legacy Marshal methods may not function on nil messages.
 | 
			
		||||
		// Check for a typed nil source only after we confirm that
 | 
			
		||||
		// legacy Marshal/Unmarshal methods are present, for
 | 
			
		||||
		// consistency.
 | 
			
		||||
		return piface.MergeOutput{Flags: piface.MergeComplete}
 | 
			
		||||
	}
 | 
			
		||||
	b, err := marshaler.Marshal()
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return piface.MergeOutput{}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user