commit 15946ecc29e1ddfb6a45e2b4db85381141acd769
author Elliott Hughes <enh@google.com> Mon Jan 22 21:34:07 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 22 21:34:07 2018 +0000
tree 2b05896c41a3a80f18ebf627e7e6412b7ea091c3
parent 7a264eede95a35e336be21a8bd914c305f2cb4c7
parent 9f461fcb2bd4116c14ed54a986bee684c12d79de

Merge "Avoid possible buffer overflow." am: 5b6c4c4612
am: 9f461fcb2b

Change-Id: Ie47864c9f1f9bfb8a34f276672dffb073d4197b6

rild/rild.c

diff --git a/rild/rild.c b/rild/rild.c
index dbd925d..685ef70 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -144,8 +144,8 @@
         exit(0);
     }
     if (strncmp(clientId, "0", MAX_CLIENT_ID_LENGTH)) {
-        strncpy(ril_service_name, ril_service_name_base, MAX_SERVICE_NAME_LENGTH);
-        strncat(ril_service_name, clientId, MAX_SERVICE_NAME_LENGTH);
+        snprintf(ril_service_name, sizeof(ril_service_name), "%s%s", ril_service_name_base,
+                 clientId);
     }
 
     if (rilLibPath == NULL) {