Skip to content

More safe fixes for std.xml #5382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
May 24, 2017
Merged

More safe fixes for std.xml #5382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions std/xml.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ S encode(S)(S s)
return result.data;
}

@safe unittest
@safe pure unittest
{
auto s = "hello";
assert(encode(s) is s);
Expand Down Expand Up @@ -2058,9 +2058,12 @@ class ElementParser
const startTag = startTags[tag_.name];
string text;

if (startTag.tagString.length == 0)
assert(0);

immutable(char)* p = startTag.tagString.ptr
+ startTag.tagString.length;
immutable(char)* q = tag_.tagString.ptr;
immutable(char)* q = &tag_.tagString[0];
text = decode(p[0..(q-p)], DecodeMode.LOOSE);

auto element = new Element(startTag);
Expand Down Expand Up @@ -2713,7 +2716,7 @@ private
* parse failure (the XML equivalent of a stack trace), giving the line and
* column number of every failure at every level.
*/
void check(string s) pure
void check(string s) @safe pure
{
try
{
Expand Down Expand Up @@ -2903,16 +2906,15 @@ class CheckException : XMLException
this.err = err;
}

private void complete(string entire) pure
private void complete(string entire) @safe pure
{
import std.encoding : transcode;
import std.string : count, lastIndexOf;
import std.utf : toUTF32;
Copy link
Member

@schveiguy schveiguy May 11, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problems here, just have to say YAY about getting rid of references to std.encoding.


string head = entire[0..$-tail.length];
ptrdiff_t n = head.lastIndexOf('\n') + 1;
line = head.count("\n") + 1;
dstring t;
transcode(head[n..$],t);
dstring t = toUTF32(head[n..$]);
column = t.length + 1;
if (err !is null) err.complete(entire);
}
Expand Down