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

Fixed a nasty rare bug caused by an assumption that 32 chars take 32 bytes.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-08-04 02:23:08 +02:00
parent 20048ea995
commit 5a1e6e994d
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/dyaml/scanner.d
View file

@ -1527,25 +1527,28 @@ final class Scanner
mixin FastCharSearch!" \t\0\n\r\u0085\u2028\u2029\'\"\\"d search; mixin FastCharSearch!" \t\0\n\r\u0085\u2028\u2029\'\"\\"d search;
size_t length = 0; size_t numCodePoints = 0;
// This is an optimized way of writing: // This is an optimized way of writing:
// while(!search.canFind(reader_.peek(length))) { ++length; } // while(!search.canFind(reader_.peek(numCodePoints))) { ++numCodePoints; }
outer: for(;;) outer: for(size_t oldSliceLength;;)
{ {
const char[] slice = reader_.slice(length + 32); // This will not necessarily make slice 32 chars longer, as not all
if(slice.length == length) // code points are 1 char.
const char[] slice = reader_.slice(numCodePoints + 32);
if(slice.length == oldSliceLength)
{ {
error("While reading a flow scalar", startMark, error("While reading a flow scalar", startMark,
"reached end of file", reader_.mark); "reached end of file", reader_.mark);
return; return;
} }
for(size_t i = length; i < slice.length;) for(size_t i = oldSliceLength; i < slice.length;)
{ {
// slice is UTF-8 - need to decode // slice is UTF-8 - need to decode
const ch = slice[i] < 0x80 ? slice[i++] : decodeValidUTF8NoGC(slice, i); const ch = slice[i] < 0x80 ? slice[i++] : decodeValidUTF8NoGC(slice, i);
if(search.canFind(ch)) { break outer; } if(search.canFind(ch)) { break outer; }
++length; ++numCodePoints;
} }
oldSliceLength = slice.length;
} }
reader_.sliceBuilder.write(reader_.get(length)); reader_.sliceBuilder.write(reader_.get(length));