diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 18:20:31 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 18:20:31 +0000 |
| commit | 4735cc369b943734227fd379c4b8a3b2bf48ff46 (patch) | |
| tree | eed16203c0e21be9a66e96eb49763c8b53e36820 | |
| parent | 1eec0acf9b016c1596bc3df77ae45cee701142b0 (diff) | |
| download | chromium_src-4735cc369b943734227fd379c4b8a3b2bf48ff46.zip chromium_src-4735cc369b943734227fd379c4b8a3b2bf48ff46.tar.gz chromium_src-4735cc369b943734227fd379c4b8a3b2bf48ff46.tar.bz2 | |
Fix recent valgrind issues with QUIC code from r213113.
NOTRY=true
R=rtenneti@chromium.org
Review URL: https://codereview.chromium.org/19584007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213172 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/tools/quic/quic_socket_utils.cc | 2 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/net/tools/quic/quic_socket_utils.cc b/net/tools/quic/quic_socket_utils.cc index 329217a..e46b849 100644 --- a/net/tools/quic/quic_socket_utils.cc +++ b/net/tools/quic/quic_socket_utils.cc @@ -89,6 +89,7 @@ int QuicSocketUtils::ReadPacket(int fd, char* buffer, size_t buf_len, hdr.msg_namelen = sizeof(sockaddr_storage); hdr.msg_iov = &iov; hdr.msg_iovlen = 1; + hdr.msg_flags = 0; struct cmsghdr *cmsg = (struct cmsghdr *) cbuf; cmsg->cmsg_len = arraysize(cbuf); @@ -143,6 +144,7 @@ int QuicSocketUtils::WritePacket(int fd, const char* buffer, size_t buf_len, hdr.msg_namelen = sizeof(raw_address); hdr.msg_iov = &iov; hdr.msg_iovlen = 1; + hdr.msg_flags = 0; const int kSpaceForIp = CMSG_SPACE(sizeof(in6_pktinfo)); char cbuf[kSpaceForIp]; diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 1528095..b0041dd 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -7395,3 +7395,19 @@ fun:_ZN7testing13PrintToStringIN5media12_GLOBAL__N_112TestScenarioEEESsRKT_ fun:_ZN7testing8internal25ParameterizedTestCaseInfoIN5media21AudioPowerMonitorTestEE13RegisterTestsEv } +{ + quic_socket_utils_write_packet_msg_name + Memcheck:Param + socketcall.sendmsg(msg.msg_name) + obj:/lib/x86_64-linux-gnu/libpthread-2.15.so + fun:_ZN3net5tools15QuicSocketUtils11WritePacketEiPKcmRKSt6vectorIhSaIhEERKNS_10IPEndPointEPi + ... +} +{ + quic_socket_utils_write_packet_msg_control + Memcheck:Param + socketcall.sendmsg(msg.msg_control) + obj:/lib/x86_64-linux-gnu/libpthread-2.15.so + fun:_ZN3net5tools15QuicSocketUtils11WritePacketEiPKcmRKSt6vectorIhSaIhEERKNS_10IPEndPointEPi + ... +} |