summaryrefslogtreecommitdiff
path: root/src/lib/libssl/bs_cbs.c
diff options
context:
space:
mode:
authorjsing <>2015-06-24 09:44:18 +0000
committerjsing <>2015-06-24 09:44:18 +0000
commit16ca3547d4f9c881bccdddd888c3f49a5aae08ef (patch)
tree72e5254ff38d73062fe12c7c5d5c7aed2cbd26a6 /src/lib/libssl/bs_cbs.c
parenta3cc0750bdef82e86f45118e2b5188160125f56c (diff)
downloadopenbsd-16ca3547d4f9c881bccdddd888c3f49a5aae08ef.tar.gz
openbsd-16ca3547d4f9c881bccdddd888c3f49a5aae08ef.tar.bz2
openbsd-16ca3547d4f9c881bccdddd888c3f49a5aae08ef.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.c7
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}