diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-05 19:51:14 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-05 20:12:19 +0200 |
| commit | 66297fc38e554a18d3897308cc1c12c91ac543c7 (patch) | |
| tree | 22ef9e9b589aa0c0bfe1bafeb2b622f0ab539409 /elevate/shellexecute.go | |
| parent | elevate: move service/token into proper module (diff) | |
| download | wireguard-windows-66297fc38e554a18d3897308cc1c12c91ac543c7.tar.xz wireguard-windows-66297fc38e554a18d3897308cc1c12c91ac543c7.zip | |
elevate: consider ImageBaseAddress to be sufficiently stable
GetModuleHandle technically returns an opaque value, so comparing to the
PEB might in some theoretical sense be cleaner.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
| -rw-r--r-- | elevate/shellexecute.go | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/elevate/shellexecute.go b/elevate/shellexecute.go index 00f2d915..149a4c57 100644 --- a/elevate/shellexecute.go +++ b/elevate/shellexecute.go @@ -22,29 +22,6 @@ const ( cSEE_MASK_DEFAULT = 0 ) -/* We could use the undocumented LdrFindEntryForAddress function instead, but that's undocumented, and we're trying - * to be as rock-solid as possible here. */ -func findCurrentDataTableEntry() (entry *cLDR_DATA_TABLE_ENTRY, err error) { - ourBase, err := getModuleHandle(nil) /* This is the same as peb->ImageBaseAddress, but that member is undocumented. */ - if err != nil { - return - } - peb := rtlGetCurrentPeb() - if peb == nil || peb.Ldr == nil { - err = windows.ERROR_INVALID_ADDRESS - return - } - for cur := peb.Ldr.InMemoryOrderModuleList.Flink; cur != &peb.Ldr.InMemoryOrderModuleList; cur = cur.Flink { - entry = (*cLDR_DATA_TABLE_ENTRY)(unsafe.Pointer(uintptr(unsafe.Pointer(cur)) - unsafe.Offsetof(cLDR_DATA_TABLE_ENTRY{}.InMemoryOrderLinks))) - if entry.DllBase == ourBase { - return - } - } - entry = nil - err = windows.ERROR_OBJECT_NOT_FOUND - return -} - func ShellExecute(program string, arguments string, directory string, show int32) (err error) { var ( program16 *uint16 |