summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-07-18 09:12:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-18 09:12:51 -0700
commite10cdcd4615d679bd8a9a6b07985e484175f3856 (patch)
treea5d793a8c3e93c48e5eff47318f83905238f3053
parent73a0ed547692599edfdc49d20e7903af4c1b80b2 (diff)
parent8ab6df2e2a4df8eb2c6bcd3325c8ac7a5b01c63e (diff)
downloadnetd-e10cdcd4615d679bd8a9a6b07985e484175f3856.tar.gz
am 8ab6df2e: am 08ff0e40: Merge "Fix memset call"
* commit '8ab6df2e2a4df8eb2c6bcd3325c8ac7a5b01c63e': Fix memset call
-rw-r--r--CommandListener.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/CommandListener.cpp b/CommandListener.cpp
index fe8e0cfa..f1bec153 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -851,8 +851,8 @@ int CommandListener::PppdCmd::runCommand(SocketClient *cli,
if (!strcmp(argv[1], "attach")) {
struct in_addr l, r, dns1, dns2;
- memset(&dns1, sizeof(struct in_addr), 0);
- memset(&dns2, sizeof(struct in_addr), 0);
+ memset(&dns1, 0, sizeof(struct in_addr));
+ memset(&dns2, 0, sizeof(struct in_addr));
if (!inet_aton(argv[3], &l)) {
cli->sendMsg(ResponseCode::CommandParameterError, "Invalid local address", false);