debian-packages/dyaml
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reader now uses validation to get the number of characters in the UTF8 buffer.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-29 23:22:16 +02:00
parent 74c161c576
commit 736de8beb9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/dyaml/reader.d
View file

@ -63,6 +63,8 @@ final class Reader
// Index of the current character in the buffer. // Index of the current character in the buffer.
size_t charIndex_ = 0; size_t charIndex_ = 0;
// Number of characters (code points) in buffer8_.
size_t characterCount_ = 0;
// Current line in file. // Current line in file.
uint line_; uint line_;
@ -133,6 +135,7 @@ final class Reader
enforce(validateResult.valid, enforce(validateResult.valid,
new ReaderException(validateResult.msg ~ new ReaderException(validateResult.msg ~
validateResult.sequence.to!string)); validateResult.sequence.to!string));
characterCount_ = validateResult.characterCount;
this.sliceBuilder8 = SliceBuilder8(this); this.sliceBuilder8 = SliceBuilder8(this);
} }
@ -148,7 +151,7 @@ final class Reader
// Throws: ReaderException if trying to read past the end of the buffer. // Throws: ReaderException if trying to read past the end of the buffer.
dchar peek(size_t index = 0) @safe pure nothrow @nogc dchar peek(size_t index = 0) @safe pure nothrow @nogc
{ {
if(buffer_.length <= charIndex_ + index) if(characterCount_ <= charIndex_ + index)
{ {
// XXX This is risky; revert this and the 'risky' change in UTF decoder // XXX This is risky; revert this and the 'risky' change in UTF decoder
// if any bugs are introduced. We rely on the assumption that Reader // if any bugs are introduced. We rely on the assumption that Reader