Merge pull request #1346 from tienthanh1993/master

shirou · web-flow · commit a63ec01c7582 · 2022-09-04T22:38:53.000+09:00
fix(process,windows): compare len(cwd) to an incorrect value
diff --git a/process/process_windows.go b/process/process_windows.go
@@ -408,7 +408,7 @@ func (p *Process) CwdWithContext(_ context.Context) (string, error) {
 		}
 		if userProcParams.CurrentDirectoryPathNameLength > 0 {
 			cwd := readProcessMemory(syscall.Handle(h), procIs32Bits, uint64(userProcParams.CurrentDirectoryPathAddress), uint(userProcParams.CurrentDirectoryPathNameLength))
-			if len(cwd) != int(userProcParams.CurrentDirectoryPathAddress) {
+			if len(cwd) != int(userProcParams.CurrentDirectoryPathNameLength) {
 				return "", errors.New("cannot read current working directory")
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ func (p *Process) CwdWithContext(_ context.Context) (string, error) {`
`408`	`408`	`}`
`409`	`409`	`if userProcParams.CurrentDirectoryPathNameLength > 0 {`
`410`	`410`	`cwd := readProcessMemory(syscall.Handle(h), procIs32Bits, uint64(userProcParams.CurrentDirectoryPathAddress), uint(userProcParams.CurrentDirectoryPathNameLength))`
`411`		`- if len(cwd) != int(userProcParams.CurrentDirectoryPathAddress) {`
	`411`	`+ if len(cwd) != int(userProcParams.CurrentDirectoryPathNameLength) {`
`412`	`412`	`return "", errors.New("cannot read current working directory")`
`413`	`413`	`}`
`414`	`414`