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

(gss_add_oid_set_member): actually check if the oid is a member

Browse Source 
first.  leave the oid_set unchanged if realloc fails.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8173 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-04-12 09:46:29 +00:00
parent 6b56b83b4c
commit a6e4379b32
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/gssapi/add_oid_set_member.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -41,13 +41,23 @@ OM_uint32 gss_add_oid_set_member (
gss_OID_set * oid_set gss_OID_set * oid_set
) )
{ {
size_t n = (*oid_set)->count + 1; gss_OID *tmp;
size_t n;
OM_uint32 res;
int present;
(*oid_set)->elements = realloc ((*oid_set)->elements, res = gss_test_oid_set_member(minor_status, member_oid, *oid_set, &present);
n * sizeof(gss_OID_desc)); if (res != GSS_S_COMPLETE)
if ((*oid_set)->elements == NULL) { return res;
if (present)
return GSS_S_COMPLETE;
n = (*oid_set)->count + 1;
tmp = realloc ((*oid_set)->elements, n * sizeof(gss_OID_desc));
if (tmp == NULL)
return GSS_S_FAILURE; return GSS_S_FAILURE;
} (*oid_set)->elements = tmp;
(*oid_set)->count = n; (*oid_set)->count = n;
(*oid_set)->elements[n-1] = *member_oid; (*oid_set)->elements[n-1] = *member_oid;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;

22
lib/gssapi/krb5/add_oid_set_member.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -41,13 +41,23 @@ OM_uint32 gss_add_oid_set_member (
gss_OID_set * oid_set gss_OID_set * oid_set
) )
{ {
size_t n = (*oid_set)->count + 1; gss_OID *tmp;
size_t n;
OM_uint32 res;
int present;
(*oid_set)->elements = realloc ((*oid_set)->elements, res = gss_test_oid_set_member(minor_status, member_oid, *oid_set, &present);
n * sizeof(gss_OID_desc)); if (res != GSS_S_COMPLETE)
if ((*oid_set)->elements == NULL) { return res;
if (present)
return GSS_S_COMPLETE;
n = (*oid_set)->count + 1;
tmp = realloc ((*oid_set)->elements, n * sizeof(gss_OID_desc));
if (tmp == NULL)
return GSS_S_FAILURE; return GSS_S_FAILURE;
} (*oid_set)->elements = tmp;
(*oid_set)->count = n; (*oid_set)->count = n;
(*oid_set)->elements[n-1] = *member_oid; (*oid_set)->elements[n-1] = *member_oid;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;