diff options
| author |   bcook <bcook@openbsd.org> | 2014-07-08 16:36:45 +0000 |
|---|---|---|
| committer | bcook <bcook@openbsd.org> | 2014-07-08 16:36:45 +0000 |
| commit | 4d168c75ed261db02395162b70680000265c5210 (patch) | |
| tree | d35d5ca415093f5add849e7913925bc94c05f698 | |
| parent | Define SMALL_REGISTER_BANK on arm and vax, for it generates faster code for (diff) | |
| download | wireguard-openbsd-4d168c75ed261db02395162b70680000265c5210.tar.xz wireguard-openbsd-4d168c75ed261db02395162b70680000265c5210.zip | |
replace malloc(strlen())/strlcpy with strdup
ok beck@ jsing@
| -rw-r--r-- | lib/libcrypto/conf/conf_def.c | 5 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/conf/conf_def.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/libcrypto/conf/conf_def.c b/lib/libcrypto/conf/conf_def.c index c4703d883b5..a5cfd86ae21 100644 --- a/lib/libcrypto/conf/conf_def.c +++ b/lib/libcrypto/conf/conf_def.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_def.c,v 1.24 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_def.c,v 1.25 2014/07/08 16:36:45 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -368,14 +368,13 @@ again: } if (psection == NULL) psection = section; - v->name = malloc(strlen(pname) + 1); + v->name = strdup(pname); v->value = NULL; if (v->name == NULL) { CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE); goto err; } - strlcpy(v->name, pname, strlen(pname) + 1); if (!str_copy(conf, psection, &(v->value), start)) goto err; diff --git a/lib/libssl/src/crypto/conf/conf_def.c b/lib/libssl/src/crypto/conf/conf_def.c index c4703d883b5..a5cfd86ae21 100644 --- a/lib/libssl/src/crypto/conf/conf_def.c +++ b/lib/libssl/src/crypto/conf/conf_def.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_def.c,v 1.24 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_def.c,v 1.25 2014/07/08 16:36:45 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -368,14 +368,13 @@ again: } if (psection == NULL) psection = section; - v->name = malloc(strlen(pname) + 1); + v->name = strdup(pname); v->value = NULL; if (v->name == NULL) { CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE); goto err; } - strlcpy(v->name, pname, strlen(pname) + 1); if (!str_copy(conf, psection, &(v->value), start)) goto err; |