From aa9c627fd2ecb9d9f48e7aebe21f6b19eb7b614e Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 18 Oct 2005 23:29:24 +0000 Subject: [PATCH] * file.c (rb_file_join): elements may contain null pointer strings. report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 64aa5c045e..a72901801d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 19 08:28:32 2005 Nobuyoshi Nakada + + * file.c (rb_file_join): elements may contain null pointer strings. + report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326] + Wed Oct 19 02:34:33 2005 Nobuyoshi Nakada * eval.c, gc.c, time.c: made internal symbols static. [ruby-dev:27435] diff --git a/file.c b/file.c index d812d7fedc..2e465e2d89 100644 --- a/file.c +++ b/file.c @@ -2789,7 +2789,7 @@ rb_file_join(ary, sep) name = StringValueCStr(result); if (i > 0 && !NIL_P(sep)) { tail = chompdirsep(name); - if (isdirsep(RSTRING(tmp)->ptr[0])) { + if (RSTRING(tmp)->ptr && isdirsep(RSTRING(tmp)->ptr[0])) { RSTRING(result)->len = tail - name; } else if (!*tail) {