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

malloc checks and fixes

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5541 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-03-15 08:30:42 +00:00
parent 899249b762
commit 475b43a4f9
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kdc/kaserver.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -199,6 +199,8 @@ krb5_ret_xdr_data(krb5_storage *sp,
size_t pad = (4 - size % 4) % 4; size_t pad = (4 - size % 4) % 4;
data->data = malloc(size); data->data = malloc(size);
if (data->data == NULL)
return ENOMEM;
ret = sp->fetch(sp, data->data, size); ret = sp->fetch(sp, data->data, size);
if(ret != size) if(ret != size)
return (ret < 0)? errno : KRB5_CC_END; return (ret < 0)? errno : KRB5_CC_END;
@@ -360,8 +362,10 @@ unparse_auth_args (krb5_storage *sp,
krb5_ret_xdr_data (sp, &data); krb5_ret_xdr_data (sp, &data);
*instance = malloc(data.length + 1); *instance = malloc(data.length + 1);
if (*instance == NULL) if (*instance == NULL) {
free (*name);
return ENOMEM; return ENOMEM;
}
memcpy (*instance, data.data, data.length); memcpy (*instance, data.data, data.length);
(*instance)[data.length] = '\0'; (*instance)[data.length] = '\0';
krb5_data_free (&data); krb5_data_free (&data);
@@ -523,16 +527,21 @@ unparse_getticket_args (krb5_storage *sp,
krb5_ret_xdr_data (sp, &data); krb5_ret_xdr_data (sp, &data);
*name = malloc(data.length + 1); *name = malloc(data.length + 1);
if (*name == NULL) if (*name == NULL) {
free (*auth_domain);
return ENOMEM; return ENOMEM;
}
memcpy (*name, data.data, data.length); memcpy (*name, data.data, data.length);
(*name)[data.length] = '\0'; (*name)[data.length] = '\0';
krb5_data_free (&data); krb5_data_free (&data);
krb5_ret_xdr_data (sp, &data); krb5_ret_xdr_data (sp, &data);
*instance = malloc(data.length + 1); *instance = malloc(data.length + 1);
if (*instance == NULL) if (*instance == NULL) {
free (*auth_domain);
free (*name);
return ENOMEM; return ENOMEM;
}
memcpy (*instance, data.data, data.length); memcpy (*instance, data.data, data.length);
(*instance)[data.length] = '\0'; (*instance)[data.length] = '\0';
krb5_data_free (&data); krb5_data_free (&data);