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

timezone: wrap dirEntries foreach in a trusted lambda instead of making the whole function @trusted

Browse source 
Signed-off-by: Luís Ferreira <contact@lsferreira.net>
This commit is contained in:
Luís Ferreira 2020-10-26 18:13:50 +00:00 • committed by The Dlang Bot
parent dfd45c0ac1
commit 7842db96a6
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
std/datetime/timezone.d
View file

@ -2417,7 +2417,7 @@ public:
Throws:
`FileException` if it fails to read from disk.
+/
static string[] getInstalledTZNames(string subName = "", string tzDatabaseDir = defaultTZDatabaseDir) @trusted
static string[] getInstalledTZNames(string subName = "", string tzDatabaseDir = defaultTZDatabaseDir) @safe
{
import std.algorithm.sorting : sort;
import std.array : appender;
@ -2448,23 +2448,28 @@ public:
else
{
import std.path : baseName;
foreach (DirEntry de; dirEntries(tzDatabaseDir, SpanMode.depth))
{
if (de.isFile)
// dirEntries is @system because it uses a DirIterator with a
// RefCounted variable, but here, no references to the payload is
// escaped to the outside, so this should be @trusted
() @trusted {
foreach (DirEntry de; dirEntries(tzDatabaseDir, SpanMode.depth))
{
auto tzName = de.name[tzDatabaseDir.length .. $];
if (!tzName.extension().empty ||
!tzName.startsWith(subName) ||
baseName(tzName) == "leapseconds" ||
tzName == "+VERSION")
if (de.isFile)
{
continue;
}
auto tzName = de.name[tzDatabaseDir.length .. $];
timezones.put(tzName);
if (!tzName.extension().empty ||
!tzName.startsWith(subName) ||
baseName(tzName) == "leapseconds" ||
tzName == "+VERSION")
{
continue;
}
timezones.put(tzName);
}
}
}
}();
}
sort(timezones.data);