diff options
| author | Matt Caswell <matt@openssl.org> | 2015-03-04 17:49:51 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-05 09:22:50 +0000 |
| commit | 9f114219508d64a5b9522006eab1ed2db918dd25 (patch) | |
| tree | 9f861c5d7606a01cd6d03b62660685d21f04c2a8 /apps/srp.c | |
| parent | 51527f1e3564f210e984fe5b654c45d34e4f03d7 (diff) | |
| download | openssl-new-9f114219508d64a5b9522006eab1ed2db918dd25.tar.gz | |
Unchecked malloc fixes
Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error
paths as I spotted them along the way.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 918bb8652969fd53f0c390c1cd909265ed502c7e)
Conflicts:
crypto/bio/bss_dgram.c
Conflicts:
apps/cms.c
apps/s_cb.c
apps/s_server.c
apps/speed.c
crypto/dh/dh_pmeth.c
ssl/s3_pkt.c
Diffstat (limited to 'apps/srp.c')
| -rw-r--r-- | apps/srp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/srp.c b/apps/srp.c index 47b45fbf9f..c679448ee7 100644 --- a/apps/srp.c +++ b/apps/srp.c @@ -435,10 +435,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 |