diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-06-24 09:44:19 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-06-24 09:44:19 +0000 |
| commit | f1c1e4b14f92e3062e74444f0850cf061145c00e (patch) | |
| tree | 43f818c5a6271f80ccd114ff54855e133d2711c0 /lib/libssl/bs_cbs.c | |
| parent | 754b80404ceadb38558d6fd6c7d5c645ff343bf1 (diff) | |
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 'lib/libssl/bs_cbs.c')
| -rw-r--r-- | lib/libssl/bs_cbs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libssl/bs_cbs.c b/lib/libssl/bs_cbs.c index d45353a8902..ea1f0108f61 100644 --- a/lib/libssl/bs_cbs.c +++ b/lib/libssl/bs_cbs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bs_cbs.c,v 1.16 2015/06/23 05:58:28 doug Exp $ */ +/* $OpenBSD: bs_cbs.c,v 1.17 2015/06/24 09:44:18 jsing Exp $ */ /* * Copyright (c) 2014, Google Inc. * @@ -86,10 +86,11 @@ CBS_stow(const CBS *cbs, uint8_t **out_ptr, size_t *out_len) if (cbs->len == 0) return 1; - *out_ptr = BUF_memdup(cbs->data, cbs->len); - if (*out_ptr == NULL) + if ((*out_ptr = malloc(cbs->len)) == NULL) return 0; + memcpy(*out_ptr, cbs->data, cbs->len); + *out_len = cbs->len; return 1; } |