Skip to content

fix problems that prevent implementing import shadowing protection #3989

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
kyllingstad merged 1 commit into from
Feb 12, 2016
Merged

fix problems that prevent implementing import shadowing protection #3989

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion std/internal/digest/sha_SSSE3.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ version(USE_SSSE3)
}
if (i1 < seq1.length)
{
res ~= seq1[i1..std.algorithm.min(i1+dist,$)];
res ~= seq1[i1..min(i1+dist,$)];
i1 += dist;
}
}
Expand Down
2 changes: 1 addition & 1 deletion std/process.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,7 @@ void kill(Pid pid, int codeOrSignal)
}
else version (Posix)
{
import core.sys.posix.signal;
import core.sys.posix.signal : kill;
if (kill(pid.osHandle, codeOrSignal) == -1)
Copy link
Member Author

@WalterBright WalterBright Feb 12, 2016

Choose a reason for hiding this comment

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

This code relied on import core.sys.posix.signal; hiding the upscope kill().

throw ProcessException.newFromErrno();
}
Expand Down
2 changes: 1 addition & 1 deletion std/zip.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ final class ZipArchive
import std.bitmanip : littleEndianToNative, nativeToLittleEndian;
import std.algorithm : max;
import std.conv : to;
import std.zlib : compress;
static import std.zlib;
Copy link
Member Author

@WalterBright WalterBright Feb 12, 2016

Choose a reason for hiding this comment

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

The later use of std.zlib.compress() relies on a bug in dmd that messed up the scope list so that std was found. Import binds are supposed to prevent inserting the module package into the symbol table.

Copy link
Member

@MartinNowak MartinNowak Feb 13, 2016

Choose a reason for hiding this comment

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

But std is definitely available here by some of the non-selective imports.

import std.datetime : DosFileTime;

string comment; /// Read/Write: the archive comment. Must be less than 65536 bytes in length.
Expand Down