diff options
author | Zach Reizner <zachr@google.com> | 2020-05-12 17:40:49 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-05-16 02:19:35 +0000 |
commit | 7ea121b916bba02c87d61ba35e38c8bd27b17163 (patch) | |
tree | 0d6be1aba5081d824bb3f13affdeb46e58093f6d | |
parent | 9a0ffde0537136c97c82fb76a004c7e1322e069b (diff) | |
download | crosvm-7ea121b916bba02c87d61ba35e38c8bd27b17163.tar crosvm-7ea121b916bba02c87d61ba35e38c8bd27b17163.tar.gz crosvm-7ea121b916bba02c87d61ba35e38c8bd27b17163.tar.bz2 crosvm-7ea121b916bba02c87d61ba35e38c8bd27b17163.tar.lz crosvm-7ea121b916bba02c87d61ba35e38c8bd27b17163.tar.xz crosvm-7ea121b916bba02c87d61ba35e38c8bd27b17163.tar.zst crosvm-7ea121b916bba02c87d61ba35e38c8bd27b17163.zip |
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>
-rw-r--r-- | msg_socket/src/msg_on_socket.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/msg_socket/src/msg_on_socket.rs b/msg_socket/src/msg_on_socket.rs index 141a8de..1172b3d 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, } } |