diff --git a/ChangeLog b/ChangeLog
index 666bde2ebe..4dbe7f893f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/file.c b/file.c
index d7a8d07cc4..f9e6f752f3 100644
--- a/file.c
+++ b/file.c
@@ -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) {