diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-29 11:59:55 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-29 11:59:55 +0000 |
commit | 0ae750341e380f8bebd589d1348c17586fb03398 (patch) | |
tree | d6a4f6a6af85cf4d68777bdd91fa54285c8c2a23 | |
parent | 784360a978ab51dbf6515d97abcc67465782ca5e (diff) | |
download | ruby-0ae750341e380f8bebd589d1348c17586fb03398.tar.gz |
* dir.c (glob_helper): infinite loop bug in win32 code.
[ruby-dev:22770]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dir.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -3,6 +3,11 @@ Thu Jan 29 19:28:16 2004 Minero Aoki <aamine@loveruby.net> * lib/net/http.rb (Request#initialize): reject only when a path is empty. [ruby-dev:22771] +Thu Jan 29 18:54:08 2004 H.Yamamoto <ocean@m2.ccsnet.ne.jp>. + + * dir.c (glob_helper): infinite loop bug in win32 code. + [ruby-dev:22770] + Thu Jan 29 17:03:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>. @@ -1205,7 +1205,7 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg) else new_isdir = NO; #else - new_isdir = dp->d_isdir ? YES : dp->d_isrep ? UNKNOWN : NO; + new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO; #endif } |