Merge pull request #24390 from smarterclayton/byte_slice

Automatic merge from submit-queue Default conversion for byte slices is incorrect Nil slices are getting allocated, which is incorrect and changes behavior in some cases. []byte(nil) -> []byte(nil) @wojtek-t

Merge pull request #24390 from smarterclayton/byte_slice
88a68e99 · k8s-merge-robot · 66dc446b · 2f59744d · 88a68e99
Commit 88a68e99 authored Apr 22, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

converter.go pkg/conversion/converter.go +4 -0

No files found.
--- a/pkg/conversion/converter.go
+++ b/pkg/conversion/converter.go
@@ -116,6 +116,10 @@ func (c *Converter) DefaultMeta(t reflect.Type) (FieldMatchingFlags, *Meta) {

 // Convert_Slice_byte_To_Slice_byte prevents recursing into every byte
 func Convert_Slice_byte_To_Slice_byte(in *[]byte, out *[]byte, s Scope) error {
+	if *in == nil {
+		*out = nil
+		return nil
+	}
 	*out = make([]byte, len(*in))
 	copy(*out, *in)
 	return nil