fix gets call with delimiter exactly at limit #3414
Merged
+29
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ter is found at pos limit If a gets call with a limit and delimiter was run on a string whose delimiter was exactly at limit, crystal would increase the perceived location of delimiter, returning a string larger by one than the supplied limit.
RX14
reviewed
Oct 12, 2016
| @@ -21,6 +21,10 @@ private class SimpleMemoryIO | |||
| @pos = 0 | |||
| end | |||
|
|
|||
| def pos=(p : Int) | |||
| @pos = p | |||
There was a problem hiding this comment.
Is this required? If it is, you should use the setter macro.
There was a problem hiding this comment.
True, it doesn't seem to be required, probably a left over of some old code?
|
Thanks for the contribution! Looks good so far. |
asterite
reviewed
Oct 12, 2016
| @@ -94,6 +94,13 @@ describe "IO::Buffered" do | |||
| io.gets('a', 3).should be_nil | |||
| end | |||
|
|
|||
| it "does gets with char and limit without off-by-one" do | |||
| io = BufferedWrapper.new(MemoryIO.new("test\nabc")) | |||
| io.gets('a', 5).to_s.size.should eq 5 | |||
There was a problem hiding this comment.
I would test what the result string is, for example:
io.gets('a', 5).should eq("test\n")Same in the specs below
|
@bmmcginty Thank you, this PR is excellent! We've made a few comments with @RX14, after fixing those things we'll merge this :-) |
|
I think I attached my replies to the wrong comments above, but both comments have been acted on. |
|
@bmmcginty Thank you!! |
asterite
added
kind:bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a gets call with a limit and delimiter was run on a string whose delimiter was exactly at limit,
crystal would increase the perceived location of delimiter,
returning a string larger by one than the supplied limit.
Second of the supplied test cases