Commit 76c6b656 authored by Dan Melnic's avatar Dan Melnic Committed by Facebook Github Bot

Omit stale check in AsyncSocket::isZeroCopyMsg

Summary: Do not check zeroCopyEnabled_ in AsyncSocket::isZeroCopyMsg to avoid an IOBuf leak when zeroCopyEnabled_ changes from true to false

Reviewed By: yfeldblum

Differential Revision: D10285664

fbshipit-source-id: 5f13426f6140668d029a89786eb9a92466d4b1f4
parent ffa5b314
...@@ -953,9 +953,8 @@ bool AsyncSocket::containsZeroCopyBuf(folly::IOBuf* ptr) { ...@@ -953,9 +953,8 @@ bool AsyncSocket::containsZeroCopyBuf(folly::IOBuf* ptr) {
bool AsyncSocket::isZeroCopyMsg(const cmsghdr& cmsg) const { bool AsyncSocket::isZeroCopyMsg(const cmsghdr& cmsg) const {
#ifdef FOLLY_HAVE_MSG_ERRQUEUE #ifdef FOLLY_HAVE_MSG_ERRQUEUE
if (zeroCopyEnabled_ && if ((cmsg.cmsg_level == SOL_IP && cmsg.cmsg_type == IP_RECVERR) ||
((cmsg.cmsg_level == SOL_IP && cmsg.cmsg_type == IP_RECVERR) || (cmsg.cmsg_level == SOL_IPV6 && cmsg.cmsg_type == IPV6_RECVERR)) {
(cmsg.cmsg_level == SOL_IPV6 && cmsg.cmsg_type == IPV6_RECVERR))) {
const struct sock_extended_err* serr = const struct sock_extended_err* serr =
reinterpret_cast<const struct sock_extended_err*>(CMSG_DATA(&cmsg)); reinterpret_cast<const struct sock_extended_err*>(CMSG_DATA(&cmsg));
return ( return (
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment