1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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/trunk@9415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-10-18 23:29:24 +00:00
parent 41771ae6c1
commit 62de00b7d1
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Wed Oct 19 08:28:32 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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 <nobu@ruby-lang.org>
* enumerator.c, eval.c, gc.c, parse.y, regparse.c, sjis.c, time.c:

2
file.c
View file

@ -2745,7 +2745,7 @@ rb_file_join(VALUE ary, VALUE 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) {