archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r29306 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-11-24 09:37:36 +00:00
parent 911692e568
commit 29160356f2
4 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Sep 20 23:23:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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]
Fri Sep 17 23:44:07 2010 Kouhei Sutou <kou@cozmixng.org> Fri Sep 17 23:44:07 2010 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb: * lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb:

2
dir.c
View file

@ -108,6 +108,7 @@ bracket(
int r; int r;
int ok = 0, not = 0; int ok = 0, not = 0;
if (p >= pend) return NULL;
if (*p == '!' || *p == '^') { if (*p == '!' || *p == '^') {
not = 1; not = 1;
p++; p++;
@ -120,6 +121,7 @@ bracket(
if (!*t1) if (!*t1)
return NULL; return NULL;
p = t1 + (r = rb_enc_mbclen(t1, pend, enc)); p = t1 + (r = rb_enc_mbclen(t1, pend, enc));
if (p >= pend) return NULL;
if (p[0] == '-' && p[1] != ']') { if (p[0] == '-' && p[1] != ']') {
const char *t2 = p + 1; const char *t2 = p + 1;
int r2; int r2;

11
test/ruby/test_rubyoptions.rb
View file

@ -445,4 +445,15 @@ class TestRubyOptions < Test::Unit::TestCase
s.close s.close
assert_equal("\"zzz\\n\"\n", result, '[ruby-core:30910]') assert_equal("\"zzz\\n\"\n", result, '[ruby-core:30910]')
end end
def test_unmatching_glob
bug3851 = '[ruby-core:32478]'
a = "a[foo"
Dir.mktmpdir do |dir|
open(File.join(dir, a), "w") {|f| f.puts("p 42")}
assert_in_out_err(["-C", dir, a], "", ["42"], [], bug3851)
File.unlink(File.join(dir, a))
assert_in_out_err(["-C", dir, a], "", [], /LoadError/, bug3851)
end
end
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 48 #define RUBY_PATCHLEVEL 49
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1