oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix leak in hx509_general_name_unparse()

Browse Source
This commit is contained in:
Nicolas Williams
2016-11-20 15:38:21 -06:00
parent d9f7718a42
commit 943e76f99b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/hx509/cert.c
View File

@@ -844,7 +844,8 @@ check_key_usage(hx509_context context, const Certificate *cert,
_hx509_unparse_Name(&cert->tbsCertificate.subject, &name); _hx509_unparse_Name(&cert->tbsCertificate.subject, &name);
hx509_set_error_string(context, 0, HX509_KU_CERT_MISSING, hx509_set_error_string(context, 0, HX509_KU_CERT_MISSING,
"Key usage %s required but missing " "Key usage %s required but missing "
"from certifiate %s", buf, name); "from certifiate %s", buf,
name ? name : "<unknown>");
free(name); free(name);
return HX509_KU_CERT_MISSING; return HX509_KU_CERT_MISSING;
} }

8
lib/hx509/name.c
View File

@@ -240,6 +240,8 @@ _hx509_Name_to_string(const Name *n, char **str)
ret = wind_ucs2utf8_length(bmp, bmplen, &k); ret = wind_ucs2utf8_length(bmp, bmplen, &k);
if (ret) { if (ret) {
free(oidname); free(oidname);
free(*str);
*str = NULL;
return ret; return ret;
} }
@@ -250,6 +252,8 @@ _hx509_Name_to_string(const Name *n, char **str)
if (ret) { if (ret) {
free(oidname); free(oidname);
free(ss); free(ss);
free(*str);
*str = NULL;
return ret; return ret;
} }
ss[k] = '\0'; ss[k] = '\0';
@@ -268,6 +272,8 @@ _hx509_Name_to_string(const Name *n, char **str)
ret = wind_ucs4utf8_length(uni, unilen, &k); ret = wind_ucs4utf8_length(uni, unilen, &k);
if (ret) { if (ret) {
free(oidname); free(oidname);
free(*str);
*str = NULL;
return ret; return ret;
} }
@@ -278,6 +284,8 @@ _hx509_Name_to_string(const Name *n, char **str)
if (ret) { if (ret) {
free(ss); free(ss);
free(oidname); free(oidname);
free(*str);
*str = NULL;
return ret; return ret;
} }
ss[k] = '\0'; ss[k] = '\0';