summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-08-01 15:17:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-08-01 15:17:47 +0000
commitbca84afd429667bf25f2288f254f6e854bcb0f04 (patch)
tree9f8c06fc31bb7e462b5809281223dfeecd7d7618
parent8ab6df2e2a4df8eb2c6bcd3325c8ac7a5b01c63e (diff)
parenta3ebcb8c2ceef6b92a672a24529cbd098f487965 (diff)
downloadnetd-bca84afd429667bf25f2288f254f6e854bcb0f04.tar.gz
Merge "Incorrect memset parameters"tools_r22.2
-rw-r--r--MDnsSdListener.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/MDnsSdListener.cpp b/MDnsSdListener.cpp
index 9a3f4f71..4944e180 100644
--- a/MDnsSdListener.cpp
+++ b/MDnsSdListener.cpp
@@ -607,8 +607,8 @@ int MDnsSdListener::Monitor::rescan() {
mPollFds = (struct pollfd *)calloc(sizeof(struct pollfd), mPollSize);
mPollRefs = (DNSServiceRef **)calloc(sizeof(DNSServiceRef *), mPollSize);
} else {
- memset(mPollFds, sizeof(struct pollfd) * mPollSize, 0);
- memset(mPollRefs, sizeof(DNSServiceRef *) * mPollSize, 0);
+ memset(mPollFds, 0, sizeof(struct pollfd) * mPollSize);
+ memset(mPollRefs, 0, sizeof(DNSServiceRef *) * mPollSize);
}
mPollFds[0].fd = mCtrlSocketPair[0];
mPollFds[0].events = POLLIN;