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

Don't clobber errno during error cleanup in krb5_storage_from_fd().

Browse Source
This commit is contained in:
Roland C. Dowdeswell
2012-05-22 11:07:19 +01:00
parent 2656659fc2
commit 7af81533ef
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/krb5/store_fd.c
View File

@@ -89,6 +89,7 @@ KRB5_LIB_FUNCTION krb5_storage * KRB5_LIB_CALL
krb5_storage_from_fd(krb5_socket_t fd_in) krb5_storage_from_fd(krb5_socket_t fd_in)
{ {
krb5_storage *sp; krb5_storage *sp;
int saved_errno;
int fd; int fd;
#ifdef SOCKET_IS_NOT_AN_FD #ifdef SOCKET_IS_NOT_AN_FD
@@ -108,16 +109,22 @@ krb5_storage_from_fd(krb5_socket_t fd_in)
if (fd < 0) if (fd < 0)
return NULL; return NULL;
errno = ENOMEM;
sp = malloc(sizeof(krb5_storage)); sp = malloc(sizeof(krb5_storage));
if (sp == NULL) { if (sp == NULL) {
saved_errno = errno;
close(fd); close(fd);
errno = saved_errno;
return NULL; return NULL;
} }
errno = ENOMEM;
sp->data = malloc(sizeof(fd_storage)); sp->data = malloc(sizeof(fd_storage));
if (sp->data == NULL) { if (sp->data == NULL) {
saved_errno = errno;
close(fd); close(fd);
free(sp); free(sp);
errno = saved_errno;
return NULL; return NULL;
} }
sp->flags = 0; sp->flags = 0;