diff options
| author | deraadt <> | 2014-06-01 22:14:53 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-06-01 22:14:53 +0000 |
| commit | d58d5e2b67c3b3655aa59a382c87a1890fd4dfcb (patch) | |
| tree | 7653013de0f49d56375c5ce5f1fedf967985ca01 /src | |
| parent | 75a7566b8e585181a56d59ce35e079e62a6a9b98 (diff) | |
| download | openbsd-d58d5e2b67c3b3655aa59a382c87a1890fd4dfcb.tar.gz openbsd-d58d5e2b67c3b3655aa59a382c87a1890fd4dfcb.tar.bz2 openbsd-d58d5e2b67c3b3655aa59a382c87a1890fd4dfcb.zip | |
realloc with NULL is same as malloc
ok guenther
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/buffer/buffer.c | 5 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/buffer/buffer.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c index 71784693be..be765087e4 100644 --- a/src/lib/libcrypto/buffer/buffer.c +++ b/src/lib/libcrypto/buffer/buffer.c | |||
| @@ -115,10 +115,7 @@ BUF_MEM_grow(BUF_MEM *str, size_t len) | |||
| 115 | return 0; | 115 | return 0; |
| 116 | } | 116 | } |
| 117 | n = (len + 3) / 3 * 4; | 117 | n = (len + 3) / 3 * 4; |
| 118 | if (str->data == NULL) | 118 | ret = realloc(str->data, n); |
| 119 | ret = malloc(n); | ||
| 120 | else | ||
| 121 | ret = realloc(str->data, n); | ||
| 122 | if (ret == NULL) { | 119 | if (ret == NULL) { |
| 123 | BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE); | 120 | BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE); |
| 124 | len = 0; | 121 | len = 0; |
diff --git a/src/lib/libssl/src/crypto/buffer/buffer.c b/src/lib/libssl/src/crypto/buffer/buffer.c index 71784693be..be765087e4 100644 --- a/src/lib/libssl/src/crypto/buffer/buffer.c +++ b/src/lib/libssl/src/crypto/buffer/buffer.c | |||
| @@ -115,10 +115,7 @@ BUF_MEM_grow(BUF_MEM *str, size_t len) | |||
| 115 | return 0; | 115 | return 0; |
| 116 | } | 116 | } |
| 117 | n = (len + 3) / 3 * 4; | 117 | n = (len + 3) / 3 * 4; |
| 118 | if (str->data == NULL) | 118 | ret = realloc(str->data, n); |
| 119 | ret = malloc(n); | ||
| 120 | else | ||
| 121 | ret = realloc(str->data, n); | ||
| 122 | if (ret == NULL) { | 119 | if (ret == NULL) { |
| 123 | BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE); | 120 | BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE); |
| 124 | len = 0; | 121 | len = 0; |