mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-30 07:00:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue 14137: std.socket.getAddressInfo breaks @safe

Browse source 
Remove abuse of @trusted in template function getAddressInfo that cannot
guarantee that the incoming type argument is @safe. Localize @trusted
block of the function to the single call to getAddressInfoImpl(), so
that any @system code in T will be caught by the type system.

Add unittest to ensure such examples of T will be rejected at
compile-time.

Mark normal unittest for getAddressInfo as @safe to ensure that the
function body itself does not introduce any non-@safe code.
This commit is contained in:
H. S. Teoh 2016-02-17 22:29:58 -08:00
parent 32f032fe65
commit c35d4aa26e
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
std/socket.d
View file

@ -945,7 +945,7 @@ private string formatGaiError(int err) @trusted
* AddressFamily.INET6); * AddressFamily.INET6);
* --- * ---
*/ */
AddressInfo[] getAddressInfo(T...)(in char[] node, T options) @trusted AddressInfo[] getAddressInfo(T...)(in char[] node, T options)
{ {
const(char)[] service = null; const(char)[] service = null;
addrinfo hints; addrinfo hints;
@ -971,7 +971,23 @@ AddressInfo[] getAddressInfo(T...)(in char[] node, T options) @trusted
static assert(0, "Unknown getAddressInfo option type: " ~ typeof(option).stringof); static assert(0, "Unknown getAddressInfo option type: " ~ typeof(option).stringof);
} }
return getAddressInfoImpl(node, service, &hints); return () @trusted { return getAddressInfoImpl(node, service, &hints); }();
}
@system unittest
{
struct Oops
{
const(char[]) breakSafety()
{
*cast(int*) 0xcafebabe = 0xdeadbeef;
return null;
}
alias breakSafety this;
}
assert(!__traits(compiles, () {
getAddressInfo("", Oops.init);
}), "getAddressInfo breaks @safe");
} }
private AddressInfo[] getAddressInfoImpl(in char[] node, in char[] service, addrinfo* hints) @system private AddressInfo[] getAddressInfoImpl(in char[] node, in char[] service, addrinfo* hints) @system
@ -1009,7 +1025,7 @@ private AddressInfo[] getAddressInfoImpl(in char[] node, in char[] service, addr
} }
unittest @safe unittest
{ {
softUnittest({ softUnittest({
if (getaddrinfoPointer) if (getaddrinfoPointer)