aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-04-07 16:12:09 -0700
committerChristopher Ferris <cferris@google.com>2014-04-07 16:12:23 -0700
commit6bc89fea4e132d3937dd5aafbabca0d12e3af22f (patch)
tree4b5e040759c159ab8abd18243d29cf0435d6922e
parent1031614c095f00454326deb460a83381e98d5166 (diff)
downloadltrace-6bc89fea4e132d3937dd5aafbabca0d12e3af22f.tar.gz
Re-add stpcpy call.
Change-Id: I1e80c3ee1693452f8f1669027fcd0a225e986eb2
-rw-r--r--sysdeps/linux-gnu/hooks.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sysdeps/linux-gnu/hooks.c b/sysdeps/linux-gnu/hooks.c
index e3bb8c1..3fb3614 100644
--- a/sysdeps/linux-gnu/hooks.c
+++ b/sysdeps/linux-gnu/hooks.c
@@ -40,10 +40,7 @@ append(const char *str1, const char *str2)
char *ret = malloc(strlen(str1) + strlen(str2) + 2);
if (ret == NULL)
return ret;
- /* BEGIN android-changed */
- strcpy(ret, str1);
- strcat(ret, str2);
- /* END android-changed */
+ strcpy(stpcpy(ret, str1), str2);
return ret;
}