Commit ecd72c00 authored by Rich Salz's avatar Rich Salz
Browse files

Copy name string in BIO_meth_new 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5319)
parent 04f53be9

crypto/bio/bio_err.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Generated by util/mkerr.pl DO NOT EDIT

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -34,6 +34,7 @@ static ERR_STRING_DATA BIO_str_functs[] = { 
    {ERR_FUNC(BIO_F_BIO_LISTEN), "BIO_listen"},

    {ERR_FUNC(BIO_F_BIO_LOOKUP), "BIO_lookup"},

    {ERR_FUNC(BIO_F_BIO_MAKE_PAIR), "bio_make_pair"},

    {ERR_FUNC(BIO_F_BIO_METH_NEW), "BIO_meth_new"},

    {ERR_FUNC(BIO_F_BIO_NEW), "BIO_new"},

    {ERR_FUNC(BIO_F_BIO_NEW_FILE), "BIO_new_file"},

    {ERR_FUNC(BIO_F_BIO_NEW_MEM_BUF), "BIO_new_mem_buf"},

crypto/bio/bio_meth.c

+9 −4
Original line number Diff line number Diff line
@@ -37,17 +37,22 @@ BIO_METHOD *BIO_meth_new(int type, const char *name) 
{

    BIO_METHOD *biom = OPENSSL_zalloc(sizeof(BIO_METHOD));



    if (biom != NULL) {

        biom->type = type;

        biom->name = name;

    if (biom == NULL

            || (biom->name = OPENSSL_strdup(name)) == NULL) {

        OPENSSL_free(biom);

        BIOerr(BIO_F_BIO_METH_NEW, ERR_R_MALLOC_FAILURE);

        return NULL;

    }

    return biom;

}



void BIO_meth_free(BIO_METHOD *biom)

{

    if (biom != NULL) {

        OPENSSL_free(biom->name);

        OPENSSL_free(biom);

    }

}



int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int)

{

include/internal/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


struct bio_method_st {

    int type;

    const char *name;

    char *name;

    int (*bwrite) (BIO *, const char *, int);

    int (*bread) (BIO *, char *, int);

    int (*bputs) (BIO *, const char *);

include/openssl/bio.h

+1 −0
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ int ERR_load_BIO_strings(void); 
# define BIO_F_BIO_LISTEN                                 139

# define BIO_F_BIO_LOOKUP                                 135

# define BIO_F_BIO_MAKE_PAIR                              121

# define BIO_F_BIO_METH_NEW                               146

# define BIO_F_BIO_NEW                                    108

# define BIO_F_BIO_NEW_FILE                               109

# define BIO_F_BIO_NEW_MEM_BUF                            126