commit 2be38acc92b5fcd52b72fa92a844f4da4d2d692d
author Naina Nalluri <nnalluri@codeaurora.org> Tue May 03 14:09:53 2016 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Thu May 05 13:37:22 2016 -0700
tree 8c6e0ec56cbd64ce60f5d2b1b513bd8cb719bdf7
parent a828e8f2c3e7fef4547d7b78d848200d8cb6d93c

ril: Fix kw issues

Fix kw issues
Import of partner fix 597883

Change-Id: I21ff028d07bf12d9aff232aeafbb01ec8d019c2a

libril/RilSapSocket.cpp

diff --git a/libril/RilSapSocket.cpp b/libril/RilSapSocket.cpp
index 19457f4..4286ae4 100644
--- a/libril/RilSapSocket.cpp
+++ b/libril/RilSapSocket.cpp
@@ -248,7 +248,7 @@
     int per_line = 0;
 
     do {
-        dest += sprintf(out, "%8.8s [%8.8x] ", who, source);
+        dest += snprintf(out, sizeof(out), "%8.8s [%8.8x] ", who, source);
         for(; source < length && dest_len - dest > 3 && per_line < BYTES_PER_LINE; source++,
         per_line ++) {
             out[dest++] = HEX_HIGH(buffer[source]);

reference-ril/reference-ril.c

diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index b9baef1..557109b 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -532,23 +532,27 @@
         err = at_tok_nextstr(&line, &out);
         if (err < 0)
             goto error;
-        responses[i].type = alloca(strlen(out) + 1);
-        strcpy(responses[i].type, out);
+
+        int type_size = strlen(out) + 1;
+        responses[i].type = alloca(type_size);
+        strlcpy(responses[i].type, out, type_size);
 
         // APN ignored for v5
         err = at_tok_nextstr(&line, &out);
         if (err < 0)
             goto error;
 
-        responses[i].ifname = alloca(strlen(PPP_TTY_PATH) + 1);
-        strcpy(responses[i].ifname, PPP_TTY_PATH);
+        int ifname_size = strlen(PPP_TTY_PATH) + 1;
+        responses[i].ifname = alloca(ifname_size);
+        strlcpy(responses[i].ifname, PPP_TTY_PATH, ifname_size);
 
         err = at_tok_nextstr(&line, &out);
         if (err < 0)
             goto error;
 
-        responses[i].addresses = alloca(strlen(out) + 1);
-        strcpy(responses[i].addresses, out);
+        int addresses_size = strlen(out) + 1;
+        responses[i].addresses = alloca(addresses_size);
+        strlcpy(responses[i].addresses, out, addresses_size);
 
         {
             char  propValue[PROP_VALUE_MAX];