Commit 1d5936e4 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/2684)
(cherry picked from commit 9ad52c56)
parent c6a9f005

apps/ca.c

+7 −5
Original line number Diff line number Diff line
@@ -1838,10 +1838,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, 
    }



    irow = app_malloc(sizeof(*irow) * (DB_NUMBER + 1), "row space");

    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)) {
@@ -1849,10 +1847,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 end;

    }

    irow = NULL;

    ok = 1;

 end:

    if (irow != NULL) {

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

            OPENSSL_free(row[i]);

        OPENSSL_free(irow);

    }



    X509_NAME_free(CAname);

    X509_NAME_free(subject);

crypto/txt_db/txt_db.c

+26 −9
Original line number Diff line number Diff line
@@ -104,13 +104,16 @@ TXT_DB *TXT_DB_read(BIO *in, int num) 
        }

        *(p++) = '\0';

        if ((n != num) || (*f != '\0')) {

            OPENSSL_free(pp);

            ret->error = DB_ERROR_WRONG_NUM_FIELDS;

            goto err;

        }

        pp[n] = p;

        if (!sk_OPENSSL_PSTRING_push(ret->data, pp))

        if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {

            OPENSSL_free(pp);

            goto err;

        }

    }

    BUF_MEM_free(buf);

    return ret;

 err:
@@ -148,7 +151,7 @@ int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *), 
                        OPENSSL_LH_HASHFUNC hash, OPENSSL_LH_COMPFUNC cmp)

{

    LHASH_OF(OPENSSL_STRING) *idx;

    OPENSSL_STRING *r;

    OPENSSL_STRING *r, *k;

    int i, n;



    if (field >= db->num_fields) {
@@ -165,13 +168,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);

        }

    }

    lh_OPENSSL_STRING_free(db->index[field]);

    db->index[field] = idx;
@@ -244,20 +252,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);

}