commit 9f461fcb2bd4116c14ed54a986bee684c12d79de
author Elliott Hughes <enh@google.com> Mon Jan 22 21:26:51 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 22 21:26:51 2018 +0000
tree 2b05896c41a3a80f18ebf627e7e6412b7ea091c3
parent 4c6991b2d0635525e5715c897dcc88238aeea5a2
parent 5b6c4c46121d48fb7ff23f7e0d1dee0e23876f1c

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

Change-Id: I3b952f06bed1713c451a24b76fb53c39c528d9bc

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) {