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

Fix some more memory leaks with TXT_DB_insert. 



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 646e6bd4

apps/ca.c

+5 −3
Original line number Diff line number Diff line
@@ -2397,18 +2397,20 @@ static int do_revoke(X509 *x509, CA_DB *db, int type, char *value) 
            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)) {

            BIO_printf(bio_err, "failed to update database\n");

            BIO_printf(bio_err, "TXT_DB error number %ld\n", db->db->error);

            OPENSSL_free(irow);

            goto err;

        }



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

            row[i] = NULL;



        /* Revoke Certificate */

        if (type == -1)

            ok = 1;

apps/srp.c

+1 −3
Original line number Diff line number Diff line
@@ -183,10 +183,8 @@ static int update_index(CA_DB *db, BIO *bio, char **row) 
        return 0;

    }



    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)) {