Merge release-20200422.0-64-g0cb9e1d (automated)

1 files changed, 6 insertions, 0 deletions

diff --git a/pkg/tcpip/buffer/view.go b/pkg/tcpip/buffer/view.go
index f01217c91..9a3c5d6c3 100644
--- a/pkg/tcpip/buffer/view.go
+++ b/pkg/tcpip/buffer/view.go
@@ -59,6 +59,9 @@ func (v *View) Reader() bytes.Reader {
 
 // ToVectorisedView returns a VectorisedView containing the receiver.
 func (v View) ToVectorisedView() VectorisedView {
+	if len(v) == 0 {
+		return VectorisedView{}
+	}
 	return NewVectorisedView(len(v), []View{v})
 }
 
@@ -229,6 +232,9 @@ func (vv *VectorisedView) Append(vv2 VectorisedView) {
 
 // AppendView appends the given view into this vectorised view.
 func (vv *VectorisedView) AppendView(v View) {
+	if len(v) == 0 {
+		return
+	}
 	vv.views = append(vv.views, v)
 	vv.size += len(v)
 }