diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-27 07:10:13 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-27 07:10:13 +0000 |
commit | 057098bfdcdbdc5bbd26fb51a7f8a37e6f8a2547 (patch) | |
tree | e10a09aee31112e34efb7ca9ebcf2ac1a8d18fb3 | |
parent | 6245e02cd37b98d2d41efda697408ae5dd36119e (diff) |
use strlcat
* addr2line.c (follow_debuglink): use strlcat instead of strncat.
* dln.c (aix_loaderror): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | addr2line.c | 6 | ||||
-rw-r--r-- | dln.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/addr2line.c b/addr2line.c index f936694724..92ff6b152b 100644 --- a/addr2line.c +++ b/addr2line.c @@ -444,10 +444,8 @@ follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms, subdir = (char *)alloca(strlen(binary_filename) + 1); strcpy(subdir, binary_filename); strcpy(binary_filename, global_debug_dir); - strncat(binary_filename, subdir, - PATH_MAX - strlen(binary_filename) - 1); - strncat(binary_filename, debuglink, - PATH_MAX - strlen(binary_filename) - 1); + strlcat(binary_filename, subdir, PATH_MAX); + strlcat(binary_filename, debuglink, PATH_MAX); munmap(current_line->mapped, current_line->mapped_size); close(current_line->fd); @@ -1180,7 +1180,7 @@ aix_loaderror(const char *pathname) { char *message[1024], errbuf[1024]; int i; -#define ERRBUF_APPEND(s) strncat(errbuf, (s), sizeof(errbuf)-strlen(errbuf)-1) +#define ERRBUF_APPEND(s) strlcat(errbuf, (s), sizeof(errbuf)) snprintf(errbuf, sizeof(errbuf), "load failed - %s. ", pathname); if (loadquery(L_GETMESSAGES, &message[0], sizeof(message)) != -1) { |