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

Use old implementation of gss_add_oid_set_member, it leaks less memory.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18817 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-22 09:36:13 +00:00
parent dbac3ad6aa
commit 56fa3ffc37
1 changed files with 53 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
lib/gssapi/mech/gss_add_oid_set_member.c
View File

@@ -1,20 +1,27 @@
/*- /*
* Copyright (c) 2005 Doug Rabson * Copyright (c) 1997 - 2001, 2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
*
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -22,55 +29,39 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*
* $FreeBSD: src/lib/libgssapi/gss_add_oid_set_member.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
*/ */
#include "mech_locl.h" #include "mech_locl.h"
RCSID("$Id$"); RCSID("$Id$");
OM_uint32 OM_uint32
gss_add_oid_set_member(OM_uint32 *minor_status, gss_add_oid_set_member (OM_uint32 * minor_status,
const gss_OID member_oid, const gss_OID member_oid,
gss_OID_set *oid_set) gss_OID_set * oid_set)
{ {
OM_uint32 major_status; gss_OID tmp;
gss_OID_set set = *oid_set; size_t n;
gss_OID new_elements; OM_uint32 res;
gss_OID new_oid; int present;
int t;
res = gss_test_oid_set_member(minor_status, member_oid, *oid_set, &present);
if (res != GSS_S_COMPLETE)
return res;
if (present) {
*minor_status = 0; *minor_status = 0;
return GSS_S_COMPLETE;
}
major_status = gss_test_oid_set_member(minor_status, n = (*oid_set)->count + 1;
member_oid, *oid_set, &t); tmp = realloc ((*oid_set)->elements, n * sizeof(gss_OID_desc));
if (major_status) if (tmp == NULL) {
return (major_status); *minor_status = ENOMEM;
if (t) return GSS_S_FAILURE;
return (GSS_S_COMPLETE); }
(*oid_set)->elements = tmp;
new_elements = malloc((set->count + 1) * sizeof(gss_OID_desc)); (*oid_set)->count = n;
if (!new_elements) { (*oid_set)->elements[n-1] = *member_oid;
*minor_status = ENOMEM; *minor_status = 0;
return (GSS_S_FAILURE); return GSS_S_COMPLETE;
}
new_oid = &new_elements[set->count];
new_oid->elements = malloc(member_oid->length);
if (!new_oid->elements) {
free(new_elements);
return (GSS_S_FAILURE);
}
new_oid->length = member_oid->length;
memcpy(new_oid->elements, member_oid->elements, member_oid->length);
if (set->elements) {
memcpy(new_elements, set->elements,
set->count * sizeof(gss_OID_desc));
free(set->elements);
}
set->elements = new_elements;
set->count++;
return (GSS_S_COMPLETE);
} }