Merge pull request #73 from whereswaldon/patch-1

[Windows] harden system DLL loading
mattn · Jan 10, 2025 · 4503567 · 4503567
2 parents 603fb50 + 40e70a5
commit 4503567
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/colorable_windows.go b/colorable_windows.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"syscall"
+	syscall "golang.org/x/sys/windows"
 	"unsafe"
 
 	"github.com/mattn/go-isatty"
@@ -73,7 +73,7 @@ type consoleCursorInfo struct {
 }
 
 var (
-	kernel32                       = syscall.NewLazyDLL("kernel32.dll")
+	kernel32                       = syscall.NewLazySystemDLL("kernel32.dll")
 	procGetConsoleScreenBufferInfo = kernel32.NewProc("GetConsoleScreenBufferInfo")
 	procSetConsoleTextAttribute    = kernel32.NewProc("SetConsoleTextAttribute")
 	procSetConsoleCursorPosition   = kernel32.NewProc("SetConsoleCursorPosition")

diff --git a/go.mod b/go.mod
@@ -1,5 +1,8 @@
 module github.com/mattn/go-colorable
 
-require github.com/mattn/go-isatty v0.0.16
+require (
+	github.com/mattn/go-isatty v0.0.16
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab
+)
 
 go 1.15