diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-03-28 22:41:03 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-03-28 23:12:57 +0100 |
| commit | 053ae65403216acdb0a4e78b25ad66ee9f444f02 (patch) | |
| tree | 9566a27945fe6cb6bb46d13bca1e9f19f7e54286 | |
| parent | eaa33214519d24a6365cce4aeb912512b2e204cb (diff) | |
| download | gnutls-053ae65403216acdb0a4e78b25ad66ee9f444f02.tar.gz | |
Better fix for the double free in dist point parsing
| -rw-r--r-- | lib/x509/x509_ext.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c index 2e69ed0bcb..f974b02796 100644 --- a/lib/x509/x509_ext.c +++ b/lib/x509/x509_ext.c @@ -2287,7 +2287,7 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext, int len, ret; uint8_t reasons[2]; unsigned i, type, rflags, j; - gnutls_datum_t san; + gnutls_datum_t san = {NULL, 0}; result = asn1_create_element (_gnutls_get_pkix(), "PKIX1.CRLDistributionPoints", &c2); @@ -2310,9 +2310,6 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext, i = 0; do { - san.data = NULL; - san.size = 0; - snprintf(name, sizeof(name), "?%u.reasons", (unsigned)i + 1); len = sizeof(reasons); @@ -2337,6 +2334,9 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext, j = 0; do { + san.data = NULL; + san.size = 0; + ret = _gnutls_parse_general_name2(c2, name, j, &san, &type, 0); @@ -2351,6 +2351,7 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext, ret = crl_dist_points_set(cdp, type, &san, rflags); if (ret < 0) break; + san.data = NULL; /* it is now in cdp */ j++; } while (ret >= 0); @@ -2360,6 +2361,7 @@ int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext, if (ret < 0 && ret != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { gnutls_assert(); + gnutls_free(san.data); goto cleanup; } |