commit 3147559c6b0ee3f59bc2bbba246581972b7889f7
author Nick Kralevich <nnk@google.com> Tue Feb 10 16:54:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 10 16:54:01 2015 +0000
tree ee55792bdac45e445235c35de88c3c5ec6686a08
parent 9f2a02409b99254f1080223dfc0a8ca03c1adcbb
parent cb6cd1fba71fc8f12907b3c66cc7f5fa4de99589

am cb6cd1fb: Merge "ril.cpp: fix misuse of strncat"

* commit 'cb6cd1fba71fc8f12907b3c66cc7f5fa4de99589':
  ril.cpp: fix misuse of strncat

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index c189e98..42196f3 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -4261,7 +4261,7 @@
 
     char rildebug[MAX_DEBUG_SOCKET_NAME_LENGTH] = SOCKET_NAME_RIL_DEBUG;
     if (inst != NULL) {
-        strncat(rildebug, inst, MAX_DEBUG_SOCKET_NAME_LENGTH);
+        strlcat(rildebug, inst, MAX_DEBUG_SOCKET_NAME_LENGTH);
     }
 
     s_fdDebug = android_get_control_socket(rildebug);