Commit a0fda2cf authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Address some code-analysis issues. 



Expression '...' is always true.
The 'b->init' variable is assigned values twice successively

Reviewed-by: default avatarKurt Roeckx <kurt@roeckx.be>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4753)
parent cef115ff

crypto/asn1/x_algor.c

+6 −5
Original line number Diff line number Diff line
@@ -28,18 +28,19 @@ IMPLEMENT_ASN1_DUP_FUNCTION(X509_ALGOR) 


int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)

{

    if (!alg)

    if (alg == NULL)

        return 0;



    if (ptype != V_ASN1_UNDEF) {

        if (alg->parameter == NULL)

            alg->parameter = ASN1_TYPE_new();

        if (alg->parameter == NULL)

            return 0;

    }

    if (alg) {



    ASN1_OBJECT_free(alg->algorithm);

    alg->algorithm = aobj;

    }



    if (ptype == 0)

        return 1;

    if (ptype == V_ASN1_UNDEF) {

crypto/bio/bss_acpt.c

+0 −1
Original line number Diff line number Diff line
@@ -450,7 +450,6 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr) 
            data->accepted_mode &= ~BIO_SOCK_NONBLOCK;

        break;

    case BIO_C_SET_FD:

        b->init = 1;

        b->num = *((int *)ptr);

        data->accept_sock = b->num;

        data->state = ACPT_S_ACCEPT;

crypto/bio/bss_mem.c

+12 −16
Original line number Diff line number Diff line
@@ -147,13 +147,11 @@ static int mem_buf_free(BIO *a, int free_all) 
{

    if (a == NULL)

        return 0;

    if (a->shutdown) {

        if ((a->init) && (a->ptr != NULL)) {

            BUF_MEM *b;



    if (a->shutdown && a->init && a->ptr != NULL) {

        BIO_BUF_MEM *bb = (BIO_BUF_MEM *)a->ptr;

        BUF_MEM *b = bb->buf;



            if (bb != NULL) {

                b = bb->buf;

        if (a->flags & BIO_FLAGS_MEM_RDONLY)

            b->data = NULL;

        BUF_MEM_free(b);
@@ -161,10 +159,8 @@ static int mem_buf_free(BIO *a, int free_all) 
            OPENSSL_free(bb->readp);

            OPENSSL_free(bb);

        }

            }

        a->ptr = NULL;

    }

    }

    return 1;

}

crypto/ec/ec2_smpl.c

+4 −6
Original line number Diff line number Diff line
@@ -603,8 +603,8 @@ int ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, 
    if (!BN_GF2m_add(lh, lh, y2))

        goto err;

    ret = BN_is_zero(lh);



 err:

    if (ctx)

    BN_CTX_end(ctx);

    BN_CTX_free(new_ctx);

    return ret;
@@ -656,7 +656,6 @@ int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, 
    ret = ((BN_cmp(aX, bX) == 0) && BN_cmp(aY, bY) == 0) ? 0 : 1;



 err:

    if (ctx)

    BN_CTX_end(ctx);

    BN_CTX_free(new_ctx);

    return ret;
@@ -698,7 +697,6 @@ int ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point, 
    ret = 1;



 err:

    if (ctx)

    BN_CTX_end(ctx);

    BN_CTX_free(new_ctx);

    return ret;

crypto/err/err.c

+3 −5
Original line number Diff line number Diff line
@@ -502,14 +502,12 @@ static unsigned long get_error_values(int inc, int top, const char **file, 
        es->err_buffer[i] = 0;

    }



    if ((file != NULL) && (line != NULL)) {

    if (file != NULL && line != NULL) {

        if (es->err_file[i] == NULL) {

            *file = "NA";

            if (line != NULL)

            *line = 0;

        } else {

            *file = es->err_file[i];

            if (line != NULL)

            *line = es->err_line[i];

        }

    }