From: Nickolai Zeldovich Date: Fri, 22 Feb 2013 23:52:21 +0000 (-0500) Subject: Fix various result checks X-Git-Tag: krb5-1.9.5-final~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d527c811296e34062c2992d2be116ba22f884497;p=thirdparty%2Fkrb5.git 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] [tlyu@mit.edu: omit inapplicable lib/kadm/srv/svr_principal.c change] (back ported from commit a9ee4a040eeacab1d410ff9e4c862484b531c401) (cherry picked from commit 2ea07b055f1eb3abbb3a7b7206ab04ff190acf84) ticket: 7618 version_fixed: 1.9.5 status: resolved --- diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c index 6874f47037..c6fe04ad11 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 51103e803c..fb858779d0 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c @@ -3248,7 +3248,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; }