| commit | 161efa6f4e7ea6657918a2f1736a692eea2f56c0 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Tue Apr 08 17:42:15 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 08 17:42:16 2014 +0000 |
| tree | 15274ab618eabe2d7031a44dca06ab0cd5eb3def | |
| parent | 5dcd313a5c96d0bc991e0f70d6c1955094057916 [diff] | |
| parent | 6bc89fea4e132d3937dd5aafbabca0d12e3af22f [diff] |
Merge "Re-add stpcpy call."
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 @@ 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; }