commit db58b4c517de41669224543a397e5028c1db961e
author android-build-team Robot <android-build-team-robot@google.com> Tue Jan 23 08:28:45 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jan 23 08:28:45 2018 +0000
tree 05453522ef166f9cf49d443fb767024cdffba9ea
parent f9048ca5b87774cb8de8e9b5ec9c4711a2766c82
parent 5a5fea16d9f36fec04588f11c952136a89c0afe4

Snap for 4560043 from 5a5fea16d9f36fec04588f11c952136a89c0afe4 to pi-release

Change-Id: If05eb445cc6adf5b1d200ed87c54d8c638fdff9c

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