diff --git a/ChangeLog b/ChangeLog
index 6657710854..42ab50011c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan  8 18:25:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): should not recurse in exceptional status.
+
 Thu Jan  8 16:51:04 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
diff --git a/dir.c b/dir.c
index d084d18a86..84b0d21dde 100644
--- a/dir.c
+++ b/dir.c
@@ -1138,7 +1138,7 @@ glob_helper(path, sub, separator, flags, func, arg) /* if separator p[-1] is rem
 	free(tmp);
     }
 
-    if (!magical) {
+    if (status == 0 && !magical) {
 	status = glob_helper(path, p, separator, flags, func, arg);
     }