mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-06 02:45:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix safety issue in randomUUID

Browse source
This commit is contained in:
monarch_dodra 2015-02-09 13:46:32 +01:00
parent f0d950ed3e
commit 219e3ceeae
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
std/uuid.d
View file

@ -166,6 +166,12 @@ public struct UUID
179, 189, 251, 70])._toString() == "8ab3060e-2cba-4f23-b74c-b52db3bdfb46"); 179, 189, 251, 70])._toString() == "8ab3060e-2cba-4f23-b74c-b52db3bdfb46");
} }
// Reinterpret the UUID as an array of some other primitive.
@trusted ref T[16 / T.sizeof] asArrayOf(T)() return
if (isIntegral!T)
{
return *cast(typeof(return)*)&data;
}
public: public:
/** /**
@ -1060,9 +1066,9 @@ unittest
* This function is not supported at compile time. * This function is not supported at compile time.
* *
*/ */
@trusted UUID randomUUID() @safe UUID randomUUID()
{ {
import std.random : rndGen, Mt19937; import std.random : rndGen;
return randomUUID(rndGen); return randomUUID(rndGen);
} }
@ -1074,18 +1080,22 @@ unittest
* randomGen = uniform RNG * randomGen = uniform RNG
* See_Also: $(XREF random, isUniformRNG) * See_Also: $(XREF random, isUniformRNG)
*/ */
@trusted UUID randomUUID(RNG)(ref RNG randomGen) if(isIntegral!(typeof(RNG.front))) UUID randomUUID(RNG)(ref RNG randomGen)
if (isInputRange!RNG && isIntegral!(ElementType!RNG))
{ {
import std.random : isUniformRNG; import std.random : isUniformRNG;
static assert(isUniformRNG!RNG, "randomGen must be an uniform RNG"); static assert (isUniformRNG!RNG, "randomGen must be a uniform RNG");
enum size_t elemSize = typeof(RNG.front).sizeof;
static assert(elemSize <= 16); alias E = ElementEncodingType!RNG;
enum size_t elemSize = E.sizeof;
static assert (elemSize <= 16);
static assert (16 % elemSize == 0);
UUID u; UUID u;
for(size_t i; i < 16; i += elemSize) foreach (ref E e ; u.asArrayOf!E())
{ {
randomGen.popFront(); randomGen.popFront();
immutable randomValue = randomGen.front; e = randomGen.front;
u.data[i .. i + elemSize] = (*cast(ubyte[elemSize]*)&randomValue)[];
} }
//set variant //set variant
@ -1102,7 +1112,7 @@ unittest
} }
/// ///
unittest @safe unittest
{ {
import std.random : Xorshift192, unpredictableSeed; import std.random : Xorshift192, unpredictableSeed;
@ -1122,13 +1132,13 @@ unittest
* to something else, this assert and the randomUUID function * to something else, this assert and the randomUUID function
* have to be updated. * have to be updated.
*/ */
unittest @safe unittest
{ {
import std.random : rndGen, Mt19937; import std.random : rndGen, Mt19937;
static assert(is(typeof(rndGen) == Mt19937)); static assert(is(typeof(rndGen) == Mt19937));
} }
unittest @safe unittest
{ {
import std.random : Xorshift192, unpredictableSeed; import std.random : Xorshift192, unpredictableSeed;
//simple call //simple call