ringlogger: have caller cleanup inherited handle on failure

zx2c4 · zx2c4 · commit 1c2ca6c204c5 · 2021-12-16T03:14:14.000+01:00
Reported-by: shuaidonga &lt;1181157720@qq.com&gt;
Signed-off-by: Jason A. Donenfeld &lt;Jason@zx2c4.com&gt;
diff --git a/ringlogger/ringlogger.go b/ringlogger/ringlogger.go
@@ -63,6 +63,7 @@ func NewRinglogger(filename, tag string) (*Ringlogger, error) {
 	}
 	rl, err := newRingloggerFromMappingHandle(mapping, tag, windows.FILE_MAP_WRITE)
 	if err != nil {
+		windows.CloseHandle(mapping)
 		return nil, err
 	}
 	rl.file = file
@@ -82,10 +83,6 @@ func newRingloggerFromMappingHandle(mappingHandle windows.Handle, tag string, ac
 	if err != nil {
 		return nil, err
 	}
-	if err != nil {
-		windows.CloseHandle(mappingHandle)
-		return nil, err
-	}
 	log := (*logMem)(unsafe.Pointer(view))
 	if log.magic != magic {
 		bytes := (*[unsafe.Sizeof(logMem{})]byte)(unsafe.Pointer(log))

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ func NewRinglogger(filename, tag string) (*Ringlogger, error) {`
`63`	`63`	`}`
`64`	`64`	`rl, err := newRingloggerFromMappingHandle(mapping, tag, windows.FILE_MAP_WRITE)`
`65`	`65`	`if err != nil {`
	`66`	`+ windows.CloseHandle(mapping)`
`66`	`67`	`return nil, err`
`67`	`68`	`}`
`68`	`69`	`rl.file = file`
`@@ -82,10 +83,6 @@ func newRingloggerFromMappingHandle(mappingHandle windows.Handle, tag string, ac`
`82`	`83`	`if err != nil {`
`83`	`84`	`return nil, err`
`84`	`85`	`}`
`85`		`- if err != nil {`
`86`		`- windows.CloseHandle(mappingHandle)`
`87`		`- return nil, err`
`88`		`- }`
`89`	`86`	`log := (*logMem)(unsafe.Pointer(view))`
`90`	`87`	`if log.magic != magic {`
`91`	`88`	`bytes := (*[unsafe.Sizeof(logMem{})]byte)(unsafe.Pointer(log))`