romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-03 21:37:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

openssl: fix bad memory free (regression)

Browse source 
... by partially reverting f975f06033. The allocation could be made by
OpenSSL so the free must be made with OPENSSL_free() to avoid problems.

Reported-by: Harold Stuart
Fixes #1005
This commit is contained in:
Daniel Stenberg 2016-09-09 23:33:09 +02:00
parent 85033bcfcc
commit 83ef21e5e9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vtls/openssl.c
View file

@ -1223,7 +1223,7 @@ static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert)
if(ASN1_STRING_type(tmp) == V_ASN1_UTF8STRING) {
j = ASN1_STRING_length(tmp);
if(j >= 0) {
peer_CN = malloc(j+1);
peer_CN = OPENSSL_malloc(j+1);
if(peer_CN) {
memcpy(peer_CN, ASN1_STRING_get0_data(tmp), j);
peer_CN[j] = '\0';
@ -1249,7 +1249,7 @@ static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert)
CURLcode rc = Curl_convert_from_utf8(data, peer_CN, strlen(peer_CN));
/* Curl_convert_from_utf8 calls failf if unsuccessful */
if(rc) {
free(peer_CN);
OPENSSL_free(peer_CN);
return rc;
}
}
@ -1271,7 +1271,7 @@ static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert)
infof(data, " common name: %s (matched)\n", peer_CN);
}
if(peer_CN)
free(peer_CN);
OPENSSL_free(peer_CN);
}
return result;