github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25436 from smarterclayton/defend_proto

Browse Source 
Add a defensive sanity check to protobuf marshal
This commit is contained in:
Jeff Lowdermilk 2016-05-13 10:45:58 -07:00
commit 1616239b4a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/runtime/types_proto.go
View File

@ -16,6 +16,10 @@ limitations under the License.
package runtime package runtime
import (
"fmt"
)
type ProtobufMarshaller interface { type ProtobufMarshaller interface {
MarshalTo(data []byte) (int, error) MarshalTo(data []byte) (int, error)
} }
@ -44,6 +48,11 @@ func (m *Unknown) NestedMarshalTo(data []byte, b ProtobufMarshaller, size uint64
if err != nil { if err != nil {
return 0, err return 0, err
} }
if uint64(n2) != size {
// programmer error: the Size() method for protobuf does not match the results of MarshalTo, which means the proto
// struct returned would be wrong.
return 0, fmt.Errorf("the Size() value of %T was %d, but NestedMarshalTo wrote %d bytes to data", b, size, n2)
}
i += n2 i += n2
} }