diff options
author | Ken Raeburn <raeburn@mit.edu> | 2008-04-30 23:18:21 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2008-04-30 23:18:21 +0000 |
commit | ec5b9670de4c7af9ebaecfbd305857ee030460c0 (patch) | |
tree | f6bf89e559978a8cea0ee428421ab75dba969381 /src/clients/ksu/ccache.c | |
parent | 4fe69e66b424f10e6a44f8bd488e3fa56682edbf (diff) | |
download | krb5-ec5b9670de4c7af9ebaecfbd305857ee030460c0.tar.gz krb5-ec5b9670de4c7af9ebaecfbd305857ee030460c0.tar.xz krb5-ec5b9670de4c7af9ebaecfbd305857ee030460c0.zip |
After malloc/realloc/calloc failures, return ENOMEM explicitly instead
of reading it from errno. This may make static analysis tools less
confused about when we return zero vs nonzero values.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20312 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/clients/ksu/ccache.c')
-rw-r--r-- | src/clients/ksu/ccache.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/clients/ksu/ccache.c b/src/clients/ksu/ccache.c index 5e9c5ec51..ec8f2af0e 100644 --- a/src/clients/ksu/ccache.c +++ b/src/clients/ksu/ccache.c @@ -226,7 +226,7 @@ int count = 0; int chunk_count = 1; if ( ! ( temp_creds = (krb5_creds **) malloc( CHUNK * sizeof(krb5_creds *)))){ - return errno; + return ENOMEM; } @@ -264,7 +264,7 @@ int chunk_count = 1; chunk_count ++; if (!(temp_creds = (krb5_creds **) realloc(temp_creds, chunk_count * CHUNK * sizeof(krb5_creds *)))){ - return errno; + return ENOMEM; } } } @@ -415,9 +415,9 @@ krb5_get_login_princ(luser, princ_list) /* check each line */ - if( !(linebuf = (char *) calloc (BUFSIZ, sizeof(char)))) return errno; + if( !(linebuf = (char *) calloc (BUFSIZ, sizeof(char)))) return ENOMEM; - if (!(buf_out = (char **) malloc( CHUNK * sizeof(char *)))) return errno; + if (!(buf_out = (char **) malloc( CHUNK * sizeof(char *)))) return ENOMEM; while ( fgets(linebuf, BUFSIZ, fp) != NULL) { /* null-terminate the input string */ @@ -434,7 +434,7 @@ krb5_get_login_princ(luser, princ_list) chunk_count ++; if (!(buf_out = (char **) realloc(buf_out, chunk_count * CHUNK * sizeof(char *)))){ - return errno; + return ENOMEM; } } @@ -442,7 +442,7 @@ krb5_get_login_princ(luser, princ_list) if (!newline) while (((gobble = getc(fp)) != EOF) && gobble != '\n'); - if( !(linebuf = (char *) calloc (BUFSIZ, sizeof(char)))) return errno; + if( !(linebuf = (char *) calloc (BUFSIZ, sizeof(char)))) return ENOMEM; } buf_out[count] = NULL; |