2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 29cb438966..b231cfe1be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul  1 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_min, enum_max): must not return Qundef.
+	  fixed: [ruby-core:05299]
+
 Fri Jul  1 00:18:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb (Delegator::respond_to): respond_to? must check
diff --git a/enum.c b/enum.c
index ce9c918067..3f9ae1d00a 100644
--- a/enum.c
+++ b/enum.c
@@ -660,6 +660,7 @@ enum_min(obj)
     VALUE result = Qundef;
 
     rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
+    if (result == Qundef) return Qnil;
     return result;
 }
 
@@ -722,6 +723,7 @@ enum_max(obj)
     VALUE result = Qundef;
 
     rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
+    if (result == Qundef) return Qnil;
     return result;
 }