diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-28 02:25:31 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-28 02:25:31 +0000 |
| commit | 4676e643aae73a39e8ecf848c8c63a4be99e85a6 (patch) | |
| tree | fb72c733d348e8c6a04dbd4344b07e9980ef864d /ext | |
| parent | a0e5aea08a2fa738b4b3aa7732022dfb86ea0ba3 (diff) | |
merges r30628 from trunk into ruby_1_9_2.
--
* 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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/psych/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/psych/parser.c b/ext/psych/parser.c index 0fa02b981f..ca2946e200 100644 --- a/ext/psych/parser.c +++ b/ext/psych/parser.c @@ -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); |