diff options
| author | Graeme Perrow <graeme.perrow@sap.com> | 2015-02-12 13:00:42 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-02-12 13:01:42 -0500 |
| commit | bb14c2c9cac6050e231d6ea88a82232270101021 (patch) | |
| tree | 5ef9acbf1e684523da8c956a08386d5b38a46627 | |
| parent | a1331af032ff038a8e2a111c54f7d0722a0f7a49 (diff) | |
| download | openssl-new-bb14c2c9cac6050e231d6ea88a82232270101021.tar.gz | |
RT3670: Check return from BUF_MEM_grow_clean
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit b0333e697c008d639c56f48e9148cb8cba957e32)
| -rw-r--r-- | crypto/conf/conf_def.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index e3ffeb21ef..faca9aeb57 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -585,7 +585,11 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from) CONFerr(CONF_F_STR_COPY, CONF_R_VARIABLE_HAS_NO_VALUE); goto err; } - BUF_MEM_grow_clean(buf, (strlen(p) + buf->length - (e - from))); + if (!BUF_MEM_grow_clean(buf, + (strlen(p) + buf->length - (e - from)))) { + CONFerr(CONF_F_STR_COPY, ERR_R_MALLOC_FAILURE); + goto err; + } while (*p) buf->data[to++] = *(p++); |