diff options
| author | Nickolai Zeldovich <nickolai@csail.mit.edu> | 2013-01-07 01:37:19 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-01-07 01:37:19 -0500 |
| commit | a9ee4a040eeacab1d410ff9e4c862484b531c401 (patch) | |
| tree | 4246b297fa2a743c00c8852ffcc3623e3742632a | |
| parent | 5e3bf4ac6cb02601c5f10c5b2804fd5028c80119 (diff) | |
| download | krb5-a9ee4a040eeacab1d410ff9e4c862484b531c401.tar.gz krb5-a9ee4a040eeacab1d410ff9e4c862484b531c401.tar.xz krb5-a9ee4a040eeacab1d410ff9e4c862484b531c401.zip | |
Fix various result checks
Correct three cases where the wrong expression was checked to see if
an allocation function returned null.
[ghudson@mit.edu: commit message, patch splitting]
ticket: 7534
target_version: 1.11.1
tags: pullup
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 2 | ||||
| -rw-r--r-- | src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c | 2 | ||||
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 5d858279d3..ae36841a78 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -1991,7 +1991,7 @@ make_ks_from_keys(krb5_context context, int n_keys, krb5_keyblock *keyblocks, int i; *ks_tuple = calloc(n_keys, sizeof(**ks_tuple)); - if (ks_tuple == NULL) + if (*ks_tuple == NULL) return ENOMEM; for (i = 0; i < n_keys; i++) { diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c index e6aa03525a..497939d2d7 100644 --- a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c +++ b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c @@ -303,7 +303,7 @@ __get_bigkey(hashp, pagep, ndx, key) key_pagep = __get_page(hashp, OADDR_TO_PAGE(DATA_OFF(pagep, ndx)), A_RAW); - if (!pagep) + if (!key_pagep) return (-1); key->size = collect_key(hashp, key_pagep, 0, NULL); key->data = hashp->bigkey_buf; diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c index dfb45c1b42..17c37c66bb 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c @@ -3619,7 +3619,7 @@ prepare_enc_data(unsigned char *indata, asn1_const_Finish(&c); *outdata = malloc((size_t)Tlen); - if (outdata == NULL) { + if (*outdata == NULL) { retval = ENOMEM; goto cleanup; } |