Skip to content
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

fix issue 20937 - std.range.array of a lengthless range with indirection is not @safe #8202

Merged
merged 2 commits into from
Aug 31, 2021
Merged

fix issue 20937 - std.range.array of a lengthless range with indirection is not @safe #8202

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c5593
fix issue 20937 - std.range.array of a lengthless range with indirect…
dukc Aug 17, 2021
28e1372
Bot, please restart CircleCI, thanks
dukc Aug 24, 2021
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
18 changes: 16 additions & 2 deletions std/array.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,19 @@ if (isPointer!Range && isIterable!(PointerTarget!Range) && !isAutodecodableStrin
)));
}

// https://issues.dlang.org/show_bug.cgi?id=20937
@safe pure nothrow unittest
{
struct S {int* x;}
struct R
{
immutable(S) front;
bool empty;
@safe pure nothrow void popFront(){empty = true;}
}
R().array;
}

/**
Convert a narrow autodecoding string to an array type that fully supports
random access. This is handled as a special case and always returns an array
Expand Down Expand Up @@ -3492,13 +3505,14 @@ if (isDynamicArray!A)
}
else
{
import core.internal.lifetime : emplaceRef;
import core.lifetime : emplace;

ensureAddable(1);
immutable len = _data.arr.length;

auto bigData = (() @trusted => _data.arr.ptr[0 .. len + 1])();
emplaceRef!(Unqual!T)(bigData[len], cast() item);
auto itemUnqual = (() @trusted => & cast() item)();
emplace(&bigData[len], *itemUnqual);
//We do this at the end, in case of exceptions
_data.arr = bigData;
}
Expand Down