diff options
Diffstat (limited to 'src/lib/libcrypto/buffer/buffer.c')
-rw-r--r-- | src/lib/libcrypto/buffer/buffer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c index ac3729d52b..e32abb14f3 100644 --- a/src/lib/libcrypto/buffer/buffer.c +++ b/src/lib/libcrypto/buffer/buffer.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: buffer.c,v 1.21 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: buffer.c,v 1.22 2017/01/29 17:49:22 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -75,7 +75,7 @@ BUF_MEM_new(void) | |||
75 | 75 | ||
76 | ret = malloc(sizeof(BUF_MEM)); | 76 | ret = malloc(sizeof(BUF_MEM)); |
77 | if (ret == NULL) { | 77 | if (ret == NULL) { |
78 | BUFerr(BUF_F_BUF_MEM_NEW, ERR_R_MALLOC_FAILURE); | 78 | BUFerror(ERR_R_MALLOC_FAILURE); |
79 | return (NULL); | 79 | return (NULL); |
80 | } | 80 | } |
81 | ret->length = 0; | 81 | ret->length = 0; |
@@ -114,13 +114,13 @@ BUF_MEM_grow(BUF_MEM *str, size_t len) | |||
114 | } | 114 | } |
115 | /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */ | 115 | /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */ |
116 | if (len > LIMIT_BEFORE_EXPANSION) { | 116 | if (len > LIMIT_BEFORE_EXPANSION) { |
117 | BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE); | 117 | BUFerror(ERR_R_MALLOC_FAILURE); |
118 | return 0; | 118 | return 0; |
119 | } | 119 | } |
120 | n = (len + 3) / 3 * 4; | 120 | n = (len + 3) / 3 * 4; |
121 | ret = realloc(str->data, n); | 121 | ret = realloc(str->data, n); |
122 | if (ret == NULL) { | 122 | if (ret == NULL) { |
123 | BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE); | 123 | BUFerror(ERR_R_MALLOC_FAILURE); |
124 | len = 0; | 124 | len = 0; |
125 | } else { | 125 | } else { |
126 | str->data = ret; | 126 | str->data = ret; |
@@ -149,7 +149,7 @@ BUF_MEM_grow_clean(BUF_MEM *str, size_t len) | |||
149 | } | 149 | } |
150 | /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */ | 150 | /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */ |
151 | if (len > LIMIT_BEFORE_EXPANSION) { | 151 | if (len > LIMIT_BEFORE_EXPANSION) { |
152 | BUFerr(BUF_F_BUF_MEM_GROW_CLEAN, ERR_R_MALLOC_FAILURE); | 152 | BUFerror(ERR_R_MALLOC_FAILURE); |
153 | return 0; | 153 | return 0; |
154 | } | 154 | } |
155 | n = (len + 3) / 3 * 4; | 155 | n = (len + 3) / 3 * 4; |
@@ -161,7 +161,7 @@ BUF_MEM_grow_clean(BUF_MEM *str, size_t len) | |||
161 | free(str->data); | 161 | free(str->data); |
162 | } | 162 | } |
163 | if (ret == NULL) { | 163 | if (ret == NULL) { |
164 | BUFerr(BUF_F_BUF_MEM_GROW_CLEAN, ERR_R_MALLOC_FAILURE); | 164 | BUFerror(ERR_R_MALLOC_FAILURE); |
165 | len = 0; | 165 | len = 0; |
166 | } else { | 166 | } else { |
167 | str->data = ret; | 167 | str->data = ret; |