From 7ea121b916bba02c87d61ba35e38c8bd27b17163 Mon Sep 17 00:00:00 2001
From: Zach Reizner <zachr@google.com>
Date: Tue, 12 May 2020 17:40:49 -0700
Subject: [PATCH] msg_socket: fix MsgOnSocket::msg_size for Option<T>

This caused None values to be transmitted as zero-bytes, which usually
caused not enough buffer space to be allocated for sending.

BUG=None
TEST=cargo test -p msg_socket

Change-Id: If12d2df56689a84054405f2ba15d1c268afad15e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2197776
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
---
 msg_socket/src/msg_on_socket.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msg_socket/src/msg_on_socket.rs b/msg_socket/src/msg_on_socket.rs
index 141a8de4d8..1172b3db29 100644
--- a/msg_socket/src/msg_on_socket.rs
+++ b/msg_socket/src/msg_on_socket.rs
@@ -175,7 +175,7 @@ impl<T: MsgOnSocket> MsgOnSocket for Option<T> {
     fn msg_size(&self) -> usize {
         match self {
             Some(v) => v.msg_size() + 1,
-            None => 0,
+            None => 1,
         }
     }