commit a17d71f60a17859b5fb8be3e773252e3d71a1189
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 26 21:49:09 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 26 21:49:09 2017 +0000
tree 917550722cc18d640acd55b72120d903647f7770
parent 777c5a3ea11a83e5e0d79ffff1298b4f16b726d5
parent 32599fd50c32c1c0dbc44625725304cf3e5ab634

Merge "Replace strlen("foo") with sizeof("foo") - 1."

tests/cts/net/jni/NativeMultinetworkJni.c

diff --git a/tests/cts/net/jni/NativeMultinetworkJni.c b/tests/cts/net/jni/NativeMultinetworkJni.c
index 6990efa..9156504 100644
--- a/tests/cts/net/jni/NativeMultinetworkJni.c
+++ b/tests/cts/net/jni/NativeMultinetworkJni.c
@@ -88,7 +88,9 @@
     return rval == 0 ? 0 : -saved_errno;
 }
 
-static const int kSockaddrStrLen = INET6_ADDRSTRLEN + strlen("[]:65535");
+// Use sizeof("x") - 1 because we need a compile-time constant, and strlen("x")
+// isn't guaranteed to fold to a constant.
+static const int kSockaddrStrLen = INET6_ADDRSTRLEN + sizeof("[]:65535") - 1;
 
 void sockaddr_ntop(const struct sockaddr *sa, socklen_t salen, char *dst, const size_t size) {
     char addrstr[INET6_ADDRSTRLEN];