From bb14c2c9cac6050e231d6ea88a82232270101021 Mon Sep 17 00:00:00 2001 From: Graeme Perrow Date: Thu, 12 Feb 2015 13:00:42 -0500 Subject: [PATCH] RT3670: Check return from BUF_MEM_grow_clean Reviewed-by: Richard Levitte (cherry picked from commit b0333e697c008d639c56f48e9148cb8cba957e32) --- crypto/conf/conf_def.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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++); -- 2.25.1