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

merges r30628 from trunk into ruby_1_9_2.

Browse source 
--
* ext/psych/parser.c (parse): fixing off-by-one error on line numbers
  in parse exceptions.  [ruby-core:34690]
* test/psych/test_parser.rb: test for error

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-01-28 02:25:31 +00:00
parent a0e5aea08a
commit 4676e643aa
4 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/psych/parser.c
View file

@ -75,7 +75,7 @@ static VALUE parse(VALUE self, VALUE yaml)
while(!done) {
if(!yaml_parser_parse(&parser, &event)) {
size_t line = parser.mark.line;
size_t line = parser.mark.line + 1;
size_t column = parser.mark.column;
yaml_parser_delete(&parser);