Commit 646e6bd4 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Rich Salz
Browse files

Fix a few memleaks in TXT_DB. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2685)
parent 1acdbb3e

apps/ca.c

+6 −5
Original line number Diff line number Diff line
@@ -2126,10 +2126,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, 
        goto err;

    }



    for (i = 0; i < DB_NUMBER; i++) {

    for (i = 0; i < DB_NUMBER; i++)

        irow[i] = row[i];

        row[i] = NULL;

    }

    irow[DB_NUMBER] = NULL;



    if (!TXT_DB_insert(db->db, irow)) {
@@ -2137,11 +2135,14 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, 
        BIO_printf(bio_err, "TXT_DB error number %ld\n", db->db->error);

        goto err;

    }

    irow = NULL;

    ok = 1;

 err:

    if (irow != NULL) {

        for (i = 0; i < DB_NUMBER; i++)

        if (row[i] != NULL)

            OPENSSL_free(row[i]);

        OPENSSL_free(irow);

    }



    if (CAname != NULL)

        X509_NAME_free(CAname);

crypto/txt_db/txt_db.c

+24 −8
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num) 
                    "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",

                    ln, num, n, f);

#endif

            OPENSSL_free(pp);

            er = 2;

            goto err;

        }
@@ -171,6 +172,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num) 
                                                               * fix :-( */

            fprintf(stderr, "failure in sk_push\n");

#endif

            OPENSSL_free(pp);

            er = 2;

            goto err;

        }
@@ -222,7 +224,7 @@ int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *), 
                        LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp)

{

    LHASH_OF(OPENSSL_STRING) *idx;

    OPENSSL_STRING *r;

    OPENSSL_STRING *r, *k;

    int i, n;



    if (field >= db->num_fields) {
@@ -239,13 +241,18 @@ int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *), 
        r = sk_OPENSSL_PSTRING_value(db->data, i);

        if ((qual != NULL) && (qual(r) == 0))

            continue;

        if ((r = lh_OPENSSL_STRING_insert(idx, r)) != NULL) {

        if ((k = lh_OPENSSL_STRING_insert(idx, r)) != NULL) {

            db->error = DB_ERROR_INDEX_CLASH;

            db->arg1 = sk_OPENSSL_PSTRING_find(db->data, r);

            db->arg1 = sk_OPENSSL_PSTRING_find(db->data, k);

            db->arg2 = i;

            lh_OPENSSL_STRING_free(idx);

            return (0);

        }

        if (lh_OPENSSL_STRING_retrieve(idx, r) == NULL) {

            db->error = DB_ERROR_MALLOC;

            lh_OPENSSL_STRING_free(idx);

            return (0);

        }

    }

    if (db->index[field] != NULL)

        lh_OPENSSL_STRING_free(db->index[field]);
@@ -320,20 +327,29 @@ int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row) 
            }

        }

    }

    /* We have passed the index checks, now just append and insert */

    if (!sk_OPENSSL_PSTRING_push(db->data, row)) {

        db->error = DB_ERROR_MALLOC;

        goto err;

    }



    for (i = 0; i < db->num_fields; i++) {

        if (db->index[i] != NULL) {

            if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))

                continue;

            (void)lh_OPENSSL_STRING_insert(db->index[i], row);

            if (lh_OPENSSL_STRING_retrieve(db->index[i], row) == NULL)

                goto err1;

        }

    }

    if (!sk_OPENSSL_PSTRING_push(db->data, row))

        goto err1;

    return (1);



 err1:

    db->error = DB_ERROR_MALLOC;

    while (i-- > 0) {

        if (db->index[i] != NULL) {

            if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))

                continue;

            (void)lh_OPENSSL_STRING_delete(db->index[i], row);

        }

    }

 err:

    return (0);

}