diff options
author | beck <> | 2017-04-28 22:46:40 +0000 |
---|---|---|
committer | beck <> | 2017-04-28 22:46:40 +0000 |
commit | 0e8cbd9898a13fec69ddf5721cdf1137fe077ca5 (patch) | |
tree | 3d1f17028c1d6966d7d9ab06847304c2fbde6b98 /src/lib/libcrypto/malloc-wrapper.c | |
parent | 56efd82fd673bfdc68211c3fedb80c9ce8fdf05b (diff) | |
download | openbsd-0e8cbd9898a13fec69ddf5721cdf1137fe077ca5.tar.gz openbsd-0e8cbd9898a13fec69ddf5721cdf1137fe077ca5.tar.bz2 openbsd-0e8cbd9898a13fec69ddf5721cdf1137fe077ca5.zip |
revert previous accidental commit
Diffstat (limited to 'src/lib/libcrypto/malloc-wrapper.c')
-rw-r--r-- | src/lib/libcrypto/malloc-wrapper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/malloc-wrapper.c b/src/lib/libcrypto/malloc-wrapper.c index d69b025173..6ba0aad7e4 100644 --- a/src/lib/libcrypto/malloc-wrapper.c +++ b/src/lib/libcrypto/malloc-wrapper.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: malloc-wrapper.c,v 1.4 2017/04/28 22:38:51 beck Exp $ */ | 1 | /* $OpenBSD: malloc-wrapper.c,v 1.5 2017/04/28 22:46:40 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Bob Beck | 3 | * Copyright (c) 2014 Bob Beck |
4 | * | 4 | * |
@@ -165,7 +165,8 @@ CRYPTO_realloc_clean(void *ptr, int old_len, int num, const char *file, | |||
165 | ret = malloc(num); | 165 | ret = malloc(num); |
166 | if (ret && ptr && old_len > 0) { | 166 | if (ret && ptr && old_len > 0) { |
167 | memcpy(ret, ptr, old_len); | 167 | memcpy(ret, ptr, old_len); |
168 | freezero(ptr, old_len); | 168 | explicit_bzero(ptr, old_len); |
169 | free(ptr); | ||
169 | } | 170 | } |
170 | return ret; | 171 | return ret; |
171 | } | 172 | } |