diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/scanf.rb | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Dec 14 11:55:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/scanf.rb (IO#scanf): fix mistaken use of rescue modifier. + a patch by Mon_Ouie at [ruby-core:52813]. [Bug #7940] + Sat Dec 14 11:44:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * util.c (ruby_qsort): fix potential stack overflow on a large diff --git a/lib/scanf.rb b/lib/scanf.rb index 199eb16cce..4827df1e42 100644 --- a/lib/scanf.rb +++ b/lib/scanf.rb @@ -657,7 +657,12 @@ class IO break if fstr.last_spec fstr.prune end - seek(start_position + matched_so_far, IO::SEEK_SET) rescue Errno::ESPIPE + + begin + seek(start_position + matched_so_far, IO::SEEK_SET) + rescue Errno::ESPIPE + end + soak_up_spaces if fstr.last_spec && fstr.space return final_result |