From 7dbb64a2ea3df9fd4a4208ade016104042b69487 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 17 Dec 2008 06:17:22 +0000 Subject: merges r20771 and r20772 from trunk into ruby_1_9_1. * ruby.c (set_arg0): use strlcpy() instead of strncpy(). * load.c (rb_feature_p): ditto. * dln.c (dln_load): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- load.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'load.c') diff --git a/load.c b/load.c index 4166d9cd26..efe130c4f6 100644 --- a/load.c +++ b/load.c @@ -193,7 +193,7 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c buf = RSTRING_PTR(bufstr); MEMCPY(buf, feature, char, len); for (i = 0; (e = loadable_ext[i]) != 0; i++) { - strncpy(buf + len, e, DLEXT_MAXLEN + 1); + strlcpy(buf + len, e, DLEXT_MAXLEN + 1); if (st_get_key(loading_tbl, (st_data_t)buf, &data)) { rb_str_resize(bufstr, 0); if (fn) *fn = (const char*)data; -- cgit v1.2.3