From dd68f290ab0f303298d5c65c7e4dde3ccbf56d11 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 7 Mar 2017 12:29:31 +0000 Subject: We no longer need to keep pointers following tls_config_set_*() calls. --- src/regress/lib/libtls/gotls/tls.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/regress/lib/libtls/gotls/tls.go b/src/regress/lib/libtls/gotls/tls.go index 74c34b4064..88d58ab33b 100644 --- a/src/regress/lib/libtls/gotls/tls.go +++ b/src/regress/lib/libtls/gotls/tls.go @@ -26,7 +26,6 @@ var ( // TLSConfig provides configuration options for a TLS context. type TLSConfig struct { - caFile *C.char tlsCfg *C.struct_tls_config } @@ -57,11 +56,9 @@ func NewConfig() (*TLSConfig, error) { // SetCAFile sets the CA file to be used for connections. func (c *TLSConfig) SetCAFile(filename string) { - if c.caFile != nil { - C.free(unsafe.Pointer(c.caFile)) - } - c.caFile = C.CString(filename) - C.tls_config_set_ca_file(c.tlsCfg, c.caFile) + caFile := C.CString(filename) + defer C.free(unsafe.Pointer(caFile)) + C.tls_config_set_ca_file(c.tlsCfg, caFile) } // InsecureNoVerifyCert disables certificate verification for the connection. -- cgit v1.2.3-55-g6feb