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

Avoid leaking memory. rename ->handle to ->handles.

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

27
appl/gssmask/gssmask.c
View File

@@ -52,7 +52,7 @@ struct client {
krb5_storage *logging; krb5_storage *logging;
char *moniker; char *moniker;
int32_t nHandle; int32_t nHandle;
struct handle *handle; struct handle *handles;
struct sockaddr_storage sa; struct sockaddr_storage sa;
socklen_t salen; socklen_t salen;
char servername[MAXHOSTNAMELEN]; char servername[MAXHOSTNAMELEN];
@@ -110,8 +110,8 @@ add_handle(struct client *c, enum handle_type type, void *data)
h->idx = ++c->nHandle; h->idx = ++c->nHandle;
h->type = type; h->type = type;
h->ptr = data; h->ptr = data;
h->next = c->handle; h->next = c->handles;
c->handle = h; c->handles = h;
return h->idx; return h->idx;
} }
@@ -138,6 +138,7 @@ del_handle(struct handle **h, int32_t idx)
gss_release_cred(&min_stat, &c); gss_release_cred(&min_stat, &c);
break; } break; }
} }
free(p);
return; return;
} }
h = &((*h)->next); h = &((*h)->next);
@@ -311,10 +312,10 @@ HandleOP(InitContext)
"targetname: <%.*s>", (int)target_name.length, "targetname: <%.*s>", (int)target_name.length,
(char *)target_name.data); (char *)target_name.data);
ctx = find_handle(c->handle, hContext, handle_context); ctx = find_handle(c->handles, hContext, handle_context);
if (ctx == NULL) if (ctx == NULL)
hContext = 0; hContext = 0;
creds = find_handle(c->handle, hCred, handle_cred); creds = find_handle(c->handles, hCred, handle_cred);
if (creds == NULL) if (creds == NULL)
abort(); abort();
@@ -367,7 +368,7 @@ HandleOP(InitContext)
NULL); NULL);
if (GSS_ERROR(maj_stat)) { if (GSS_ERROR(maj_stat)) {
if (hContext != 0) if (hContext != 0)
del_handle(&c->handle, hContext); del_handle(&c->handles, hContext);
new_context_id = 0; new_context_id = 0;
logmessage(c, __FILE__, __LINE__, 0, logmessage(c, __FILE__, __LINE__, 0,
"gss_init_sec_context returns code: %d/%d", "gss_init_sec_context returns code: %d/%d",
@@ -421,7 +422,7 @@ HandleOP(AcceptContext)
ret32(c, flags); ret32(c, flags);
retdata(c, in_token); retdata(c, in_token);
ctx = find_handle(c->handle, hContext, handle_context); ctx = find_handle(c->handles, hContext, handle_context);
if (ctx == NULL) if (ctx == NULL)
hContext = 0; hContext = 0;
@@ -447,7 +448,7 @@ HandleOP(AcceptContext)
&deleg_cred); &deleg_cred);
if (GSS_ERROR(maj_stat)) { if (GSS_ERROR(maj_stat)) {
if (hContext != 0) if (hContext != 0)
del_handle(&c->handle, hContext); del_handle(&c->handles, hContext);
logmessage(c, __FILE__, __LINE__, 0, logmessage(c, __FILE__, __LINE__, 0,
"gss_accept_sec_context returns code: %d/%d", "gss_accept_sec_context returns code: %d/%d",
maj_stat, min_stat); maj_stat, min_stat);
@@ -495,7 +496,7 @@ HandleOP(ToastResource)
ret32(c, handle); ret32(c, handle);
logmessage(c, __FILE__, __LINE__, 0, "toasting %d", handle); logmessage(c, __FILE__, __LINE__, 0, "toasting %d", handle);
del_handle(&c->handle, handle); del_handle(&c->handles, handle);
put32(c, GSMERR_OK); put32(c, GSMERR_OK);
return 0; return 0;
@@ -562,7 +563,7 @@ HandleOP(Sign)
ret32(c, seqno); ret32(c, seqno);
retdata(c, token); retdata(c, token);
ctx = find_handle(c->handle, hContext, handle_context); ctx = find_handle(c->handles, hContext, handle_context);
if (ctx == NULL) if (ctx == NULL)
errx(1, "sign: reference to unknown context"); errx(1, "sign: reference to unknown context");
@@ -599,7 +600,7 @@ HandleOP(Verify)
ret32(c, hContext); ret32(c, hContext);
ctx = find_handle(c->handle, hContext, handle_context); ctx = find_handle(c->handles, hContext, handle_context);
if (ctx == NULL) if (ctx == NULL)
errx(1, "verify: reference to unknown context"); errx(1, "verify: reference to unknown context");
@@ -733,7 +734,7 @@ HandleOP(Wrap)
ret32(c, seqno); ret32(c, seqno);
retdata(c, token); retdata(c, token);
ctx = find_handle(c->handle, hContext, handle_context); ctx = find_handle(c->handles, hContext, handle_context);
if (ctx == NULL) if (ctx == NULL)
errx(1, "wrap: reference to unknown context"); errx(1, "wrap: reference to unknown context");
@@ -775,7 +776,7 @@ HandleOP(Unwrap)
ret32(c, seqno); ret32(c, seqno);
retdata(c, token); retdata(c, token);
ctx = find_handle(c->handle, hContext, handle_context); ctx = find_handle(c->handles, hContext, handle_context);
if (ctx == NULL) if (ctx == NULL)
errx(1, "unwrap: reference to unknown context"); errx(1, "unwrap: reference to unknown context");