generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Memory leak fix.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2004-03-05 23:39:42 +00:00
parent bc50157010
commit 216ad9ef58
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/pem/pem_lib.c
View File

@@ -537,7 +537,7 @@ int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
long len) long len)
{ {
int nlen,n,i,j,outl; int nlen,n,i,j,outl;
unsigned char *buf; unsigned char *buf = NULL;
EVP_ENCODE_CTX ctx; EVP_ENCODE_CTX ctx;
int reason=ERR_R_BUF_LIB; int reason=ERR_R_BUF_LIB;
@@ -557,7 +557,7 @@ int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
goto err; goto err;
} }
buf=(unsigned char *)OPENSSL_malloc(PEM_BUFSIZE*8); buf = OPENSSL_malloc(PEM_BUFSIZE*8);
if (buf == NULL) if (buf == NULL)
{ {
reason=ERR_R_MALLOC_FAILURE; reason=ERR_R_MALLOC_FAILURE;
@@ -578,12 +578,15 @@ int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
EVP_EncodeFinal(&ctx,buf,&outl); EVP_EncodeFinal(&ctx,buf,&outl);
if ((outl > 0) && (BIO_write(bp,(char *)buf,outl) != outl)) goto err; if ((outl > 0) && (BIO_write(bp,(char *)buf,outl) != outl)) goto err;
OPENSSL_free(buf); OPENSSL_free(buf);
buf = NULL;
if ( (BIO_write(bp,"-----END ",9) != 9) || if ( (BIO_write(bp,"-----END ",9) != 9) ||
(BIO_write(bp,name,nlen) != nlen) || (BIO_write(bp,name,nlen) != nlen) ||
(BIO_write(bp,"-----\n",6) != 6)) (BIO_write(bp,"-----\n",6) != 6))
goto err; goto err;
return(i+outl); return(i+outl);
err: err:
if (buf)
OPENSSL_free(buf);
PEMerr(PEM_F_PEM_WRITE_BIO,reason); PEMerr(PEM_F_PEM_WRITE_BIO,reason);
return(0); return(0);
} }