diff options
| author | Elliott Hughes <enh@google.com> | 2018-01-22 21:39:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-22 21:39:07 +0000 |
| commit | 5a5fea16d9f36fec04588f11c952136a89c0afe4 (patch) | |
| tree | 05453522ef166f9cf49d443fb767024cdffba9ea | |
| parent | 53ad95ded82391507a7c516ff317385becdb2025 (diff) | |
| parent | 15946ecc29e1ddfb6a45e2b4db85381141acd769 (diff) | |
| download | platform_hardware_ril-5a5fea16d9f36fec04588f11c952136a89c0afe4.tar.gz platform_hardware_ril-5a5fea16d9f36fec04588f11c952136a89c0afe4.tar.bz2 platform_hardware_ril-5a5fea16d9f36fec04588f11c952136a89c0afe4.zip | |
Merge "Avoid possible buffer overflow." am: 5b6c4c4612 am: 9f461fcb2b
am: 15946ecc29
Change-Id: I945904ff338b30296a1cae508160689758bf55e2
| -rw-r--r-- | rild/rild.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rild/rild.c b/rild/rild.c index dbd925dc..685ef70f 100644 --- a/rild/rild.c +++ b/rild/rild.c @@ -144,8 +144,8 @@ int main(int argc, char **argv) { 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) { |