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

(hx509_query_match_issuer_serial): make a copy of the data

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19249 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-06 13:08:31 +00:00
parent 24ce3844d0
commit b6b9423a2b
1 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/hx509/cert.c
View File

@@ -1877,12 +1877,37 @@ hx509_query_match_option(hx509_query *q, hx509_query_option option)
int int
hx509_query_match_issuer_serial(hx509_query *q, hx509_query_match_issuer_serial(hx509_query *q,
Name *issuer, const Name *issuer,
heim_integer *serialNumber) const heim_integer *serialNumber)
{ {
int ret;
if (q->serial) {
der_free_heim_integer(q->serial);
free(q->serial);
}
q->serial = malloc(sizeof(*q->serial));
if (q->serial == NULL)
return ENOMEM;
ret = der_copy_heim_integer(serialNumber, q->serial);
if (ret) {
free(q->serial);
q->serial = NULL;
return ret;
}
if (q->issuer_name) {
free_Name(q->issuer_name);
free(q->issuer_name);
}
q->issuer_name = malloc(sizeof(*q->issuer_name));
if (q->issuer_name == NULL)
return ENOMEM;
ret = copy_Name(issuer, q->issuer_name);
if (ret) {
free(q->issuer_name);
q->issuer_name = NULL;
return ret;
}
q->match |= HX509_QUERY_MATCH_SERIALNUMBER|HX509_QUERY_MATCH_ISSUER_NAME; q->match |= HX509_QUERY_MATCH_SERIALNUMBER|HX509_QUERY_MATCH_ISSUER_NAME;
q->serial = serialNumber;
q->issuer_name = issuer;
return 0; return 0;
} }
@@ -1917,6 +1942,16 @@ hx509_query_match_cmp_func(hx509_query *q,
void void
hx509_query_free(hx509_context context, hx509_query *q) hx509_query_free(hx509_context context, hx509_query *q)
{ {
if (q->serial) {
der_free_heim_integer(q->serial);
free(q->serial);
q->serial = NULL;
}
if (q->issuer_name) {
free_Name(q->issuer_name);
free(q->issuer_name);
q->issuer_name = NULL;
}
if (q) { if (q) {
free(q->friendlyname); free(q->friendlyname);
memset(q, 0, sizeof(*q)); memset(q, 0, sizeof(*q));