bug fixed: memory leak in pkey.go

xhawk18 · xhawk18 · commit 3f36b039a2b7 · 2019-10-23T16:03:09.000+08:00
diff --git a/go/gmssl/pkey.go b/go/gmssl/pkey.go
@@ -672,6 +672,8 @@ func GeneratePrivateKey(alg string, args [][2]string, eng *Engine) (*PrivateKey,
 	defer C.free(unsafe.Pointer(calg))
 
 	ctx := C.new_pkey_keygen_ctx(calg, nil)
+	defer C.EVP_PKEY_CTX_free(ctx)
+
 	/*
 	if eng != nil {
 		ctx := C.new_pkey_keygen_ctx(calg, eng.engine)
@@ -890,6 +892,7 @@ func (pk *PublicKey) Encrypt(alg string, in []byte, eng *Engine) ([]byte, error)
 	if out == nil {
 		return nil, GetErrors()
 	}
+	defer C.free(unsafe.Pointer(out))
 	return C.GoBytes(unsafe.Pointer(out), C.int(outlen)), nil
 }
 
@@ -902,6 +905,7 @@ func (sk *PrivateKey) Decrypt(alg string, in []byte, eng *Engine) ([]byte, error
 	if out == nil {
 		return nil, GetErrors()
 	}
+	defer C.free(unsafe.Pointer(out))
 	return C.GoBytes(unsafe.Pointer(out), C.int(outlen)), nil
 }
 
@@ -915,6 +919,7 @@ func (sk *PrivateKey) Sign(alg string, dgst []byte, eng *Engine) ([]byte, error)
 		C.ERR_print_errors_fp(C.stderr)
 		return nil, GetErrors()
 	}
+	defer C.free(unsafe.Pointer(sig))
 	return C.GoBytes(unsafe.Pointer(sig), C.int(siglen)), nil
 }
 
@@ -938,6 +943,7 @@ func (sk *PrivateKey) DeriveKey(alg string, peer PublicKey, eng *Engine) ([]byte
 	if key == nil {
 		return nil, GetErrors()
 	}
+	defer C.free(unsafe.Pointer(key))
 	return C.GoBytes(unsafe.Pointer(key), C.int(keylen)), nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,8 @@ func GeneratePrivateKey(alg string, args [][2]string, eng Engine) (PrivateKey,`
`672`	`672`	`defer C.free(unsafe.Pointer(calg))`
`673`	`673`
`674`	`674`	`ctx := C.new_pkey_keygen_ctx(calg, nil)`
	`675`	`+ defer C.EVP_PKEY_CTX_free(ctx)`
	`676`	`+`
`675`	`677`	`/*`
`676`	`678`	`if eng != nil {`
`677`	`679`	`ctx := C.new_pkey_keygen_ctx(calg, eng.engine)`
`@@ -890,6 +892,7 @@ func (pk PublicKey) Encrypt(alg string, in []byte, eng Engine) ([]byte, error)`
`890`	`892`	`if out == nil {`
`891`	`893`	`return nil, GetErrors()`
`892`	`894`	`}`
	`895`	`+ defer C.free(unsafe.Pointer(out))`
`893`	`896`	`return C.GoBytes(unsafe.Pointer(out), C.int(outlen)), nil`
`894`	`897`	`}`
`895`	`898`
`@@ -902,6 +905,7 @@ func (sk PrivateKey) Decrypt(alg string, in []byte, eng Engine) ([]byte, error`
`902`	`905`	`if out == nil {`
`903`	`906`	`return nil, GetErrors()`
`904`	`907`	`}`
	`908`	`+ defer C.free(unsafe.Pointer(out))`
`905`	`909`	`return C.GoBytes(unsafe.Pointer(out), C.int(outlen)), nil`
`906`	`910`	`}`
`907`	`911`
`@@ -915,6 +919,7 @@ func (sk PrivateKey) Sign(alg string, dgst []byte, eng Engine) ([]byte, error)`
`915`	`919`	`C.ERR_print_errors_fp(C.stderr)`
`916`	`920`	`return nil, GetErrors()`
`917`	`921`	`}`
	`922`	`+ defer C.free(unsafe.Pointer(sig))`
`918`	`923`	`return C.GoBytes(unsafe.Pointer(sig), C.int(siglen)), nil`
`919`	`924`	`}`
`920`	`925`
`@@ -938,6 +943,7 @@ func (sk PrivateKey) DeriveKey(alg string, peer PublicKey, eng Engine) ([]byte`
`938`	`943`	`if key == nil {`
`939`	`944`	`return nil, GetErrors()`
`940`	`945`	`}`
	`946`	`+ defer C.free(unsafe.Pointer(key))`
`941`	`947`	`return C.GoBytes(unsafe.Pointer(key), C.int(keylen)), nil`
`942`	`948`	`}`
`943`	`949`