Commit d6b4a41d authored by Matt Caswell's avatar Matt Caswell
Browse files

Unchecked malloc fixes 



Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error
paths as I spotted them along the way.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit 918bb865)

Conflicts:
	crypto/bio/bss_dgram.c
parent 9fdbaf3a

apps/apps.c

+11 −0
Original line number Diff line number Diff line
@@ -574,6 +574,11 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp) 
        char *prompt = NULL;



        prompt = UI_construct_prompt(ui, "pass phrase", prompt_info);

        if(!prompt) {

            BIO_printf(bio_err, "Out of memory\n");

            UI_free(ui);

            return 0;

        }



        ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;

        UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
@@ -583,6 +588,12 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp) 
                                     PW_MIN_LENGTH, bufsiz - 1);

        if (ok >= 0 && verify) {

            buff = (char *)OPENSSL_malloc(bufsiz);

            if(!buff) {

                BIO_printf(bio_err, "Out of memory\n");

                UI_free(ui);

                OPENSSL_free(prompt);

                return 0;

            }

            ok = UI_add_verify_string(ui, prompt, ui_flags, buff,

                                      PW_MIN_LENGTH, bufsiz - 1, buf);

        }

apps/ca.c

+8 −0
Original line number Diff line number Diff line
@@ -563,10 +563,18 @@ int MAIN(int argc, char **argv) 
#ifdef OPENSSL_SYS_VMS

        len = strlen(s) + sizeof(CONFIG_FILE);

        tofree = OPENSSL_malloc(len);

        if(!tofree) {

            BIO_printf(bio_err, "Out of memory\n");

            goto err;

        }

        strcpy(tofree, s);

#else

        len = strlen(s) + sizeof(CONFIG_FILE) + 1;

        tofree = OPENSSL_malloc(len);

        if(!tofree) {

            BIO_printf(bio_err, "Out of memory\n");

            goto err;

        }

        BUF_strlcpy(tofree, s, len);

        BUF_strlcat(tofree, "/", len);

#endif

apps/cms.c

+4 −0
Original line number Diff line number Diff line
@@ -463,6 +463,10 @@ int MAIN(int argc, char **argv) 
            if (key_param == NULL || key_param->idx != keyidx) {

                cms_key_param *nparam;

                nparam = OPENSSL_malloc(sizeof(cms_key_param));

                if(!nparam) {

                    BIO_printf(bio_err, "Out of memory\n");

                    goto argerr;

                }

                nparam->idx = keyidx;

                nparam->param = sk_OPENSSL_STRING_new_null();

                nparam->next = NULL;

apps/dgst.c

+5 −0
Original line number Diff line number Diff line
@@ -460,6 +460,11 @@ int MAIN(int argc, char **argv) 
            ERR_print_errors(bio_err);

            goto end;

        }

        if (!sigbuf) {

            BIO_printf(bio_err, "Out of memory\n");

            ERR_print_errors(bio_err);

            goto end;

        }

        siglen = BIO_read(sigbio, sigbuf, siglen);

        BIO_free(sigbio);

        if (siglen <= 0) {

apps/rsautl.c

+5 −0
Original line number Diff line number Diff line
@@ -268,6 +268,11 @@ int MAIN(int argc, char **argv) 


    rsa_in = OPENSSL_malloc(keysize * 2);

    rsa_out = OPENSSL_malloc(keysize);

    if (!rsa_in || !rsa_out) {

        BIO_printf(bio_err, "Out of memory\n");

        ERR_print_errors(bio_err);

        goto end;

    }



    /* Read the input data */

    rsa_inlen = BIO_read(in, rsa_in, keysize * 2);