diff options
| author | jsing <> | 2015-06-24 09:44:18 +0000 |
|---|---|---|
| committer | jsing <> | 2015-06-24 09:44:18 +0000 |
| commit | 346042b6e220ac94d87729e430272193855ae67a (patch) | |
| tree | 72e5254ff38d73062fe12c7c5d5c7aed2cbd26a6 /src/lib/libssl/bs_cbs.c | |
| parent | 9a31903e554f01ace552d6ed0a48e3af5e464664 (diff) | |
| download | openbsd-346042b6e220ac94d87729e430272193855ae67a.tar.gz openbsd-346042b6e220ac94d87729e430272193855ae67a.tar.bz2 openbsd-346042b6e220ac94d87729e430272193855ae67a.zip | |
Stop using BUF_memdup() within the LibreSSL code base - it is correctly
spelt malloc+memcpy, which is what is used in all except two places.
ok deraadt@ doug@
Diffstat (limited to 'src/lib/libssl/bs_cbs.c')
| -rw-r--r-- | src/lib/libssl/bs_cbs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/bs_cbs.c b/src/lib/libssl/bs_cbs.c index d45353a890..ea1f0108f6 100644 --- a/src/lib/libssl/bs_cbs.c +++ b/src/lib/libssl/bs_cbs.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bs_cbs.c,v 1.16 2015/06/23 05:58:28 doug Exp $ */ | 1 | /* $OpenBSD: bs_cbs.c,v 1.17 2015/06/24 09:44:18 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014, Google Inc. | 3 | * Copyright (c) 2014, Google Inc. |
| 4 | * | 4 | * |
| @@ -86,10 +86,11 @@ CBS_stow(const CBS *cbs, uint8_t **out_ptr, size_t *out_len) | |||
| 86 | if (cbs->len == 0) | 86 | if (cbs->len == 0) |
| 87 | return 1; | 87 | return 1; |
| 88 | 88 | ||
| 89 | *out_ptr = BUF_memdup(cbs->data, cbs->len); | 89 | if ((*out_ptr = malloc(cbs->len)) == NULL) |
| 90 | if (*out_ptr == NULL) | ||
| 91 | return 0; | 90 | return 0; |
| 92 | 91 | ||
| 92 | memcpy(*out_ptr, cbs->data, cbs->len); | ||
| 93 | |||
| 93 | *out_len = cbs->len; | 94 | *out_len = cbs->len; |
| 94 | return 1; | 95 | return 1; |
| 95 | } | 96 | } |
