From 29160356f2166e8b11d5fd1fa70da85579914437 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 24 Nov 2010 09:37:36 +0000 Subject: merges r29306 from trunk into ruby_1_9_2. -- * dir.c (bracket): get rid of scanning at the end of the pattern string, not to raise an exception while globbing command line. [ruby-core:32478] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dir.c') diff --git a/dir.c b/dir.c index 3818974a4d..0339697279 100644 --- a/dir.c +++ b/dir.c @@ -108,6 +108,7 @@ bracket( int r; int ok = 0, not = 0; + if (p >= pend) return NULL; if (*p == '!' || *p == '^') { not = 1; p++; @@ -120,6 +121,7 @@ bracket( if (!*t1) return NULL; p = t1 + (r = rb_enc_mbclen(t1, pend, enc)); + if (p >= pend) return NULL; if (p[0] == '-' && p[1] != ']') { const char *t2 = p + 1; int r2; -- cgit v1.2.3