Commit 6dbe4dc4 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/5318)
parent 4e075253

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-2017 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
@@ -30,6 +30,7 @@ static const ERR_STRING_DATA BIO_str_functs[] = { 
    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_LOOKUP, 0), "BIO_lookup"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_LOOKUP_EX, 0), "BIO_lookup_ex"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_MAKE_PAIR, 0), "bio_make_pair"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_METH_NEW, 0), "BIO_meth_new"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NEW, 0), "BIO_new"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NEW_DGRAM_SCTP, 0), "BIO_new_dgram_sctp"},

    {ERR_PACK(ERR_LIB_BIO, BIO_F_BIO_NEW_FILE, 0), "BIO_new_file"},

crypto/bio/bio_meth.c

+10 −4
Original line number Diff line number Diff line
@@ -37,17 +37,23 @@ 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;

    }

    biom->type = type;

    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)

{

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ BIO_F_BIO_LISTEN:139:BIO_listen 
BIO_F_BIO_LOOKUP:135:BIO_lookup

BIO_F_BIO_LOOKUP_EX:143:BIO_lookup_ex

BIO_F_BIO_MAKE_PAIR:121:bio_make_pair

BIO_F_BIO_METH_NEW:146:BIO_meth_new

BIO_F_BIO_NEW:108:BIO_new

BIO_F_BIO_NEW_DGRAM_SCTP:145:BIO_new_dgram_sctp

BIO_F_BIO_NEW_FILE:109:BIO_new_file

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 *, size_t, size_t *);

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

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

include/openssl/bioerr.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ int ERR_load_BIO_strings(void); 
# define BIO_F_BIO_LOOKUP                                 135

# define BIO_F_BIO_LOOKUP_EX                              143

# 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_DGRAM_SCTP                         145

# define BIO_F_BIO_NEW_FILE                               109