diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 22:51:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 22:53:07 +0200 |
| commit | 2a00e489122f6c4b525090dbdba2855a2ea2d519 (patch) | |
| tree | 815e5c842bccb2bc6eb4b2934ef618fe32b820ca /openssl/crypto/conf/conf_def.c | |
| parent | 4ba9be2882d9f1567809edb0a31fcdf11320d41f (diff) | |
| download | vcxsrv-2a00e489122f6c4b525090dbdba2855a2ea2d519.tar.gz vcxsrv-2a00e489122f6c4b525090dbdba2855a2ea2d519.tar.bz2 vcxsrv-2a00e489122f6c4b525090dbdba2855a2ea2d519.zip | |
Upgraded to openssl 1.0.2a
Diffstat (limited to 'openssl/crypto/conf/conf_def.c')
| -rw-r--r-- | openssl/crypto/conf/conf_def.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openssl/crypto/conf/conf_def.c b/openssl/crypto/conf/conf_def.c index e3ffeb21e..faca9aeb5 100644 --- a/openssl/crypto/conf/conf_def.c +++ b/openssl/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++); |