diff options
| author | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
| commit | e393e47b1e23744a7d0ed999afb5d137070f5f8f (patch) | |
| tree | 9739a803477c4610ec6628d914bdcc55fbb3602a /crypto/openssl/crypto/conf/conf_mod.c | |
| parent | a8b00dea2cde4c3d96e6ed1de530ddff21012266 (diff) | |
| parent | 532b4084cb8cac5e6d91d42aa6a497dd4ba4a4f5 (diff) | |
| download | FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.zip FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.tar.gz | |
Merge OpenSSL 1.0.1c.
Approved by: benl (maintainer)
Diffstat (limited to 'crypto/openssl/crypto/conf/conf_mod.c')
| -rw-r--r-- | crypto/openssl/crypto/conf/conf_mod.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/conf/conf_mod.c b/crypto/openssl/crypto/conf/conf_mod.c index ee9c677..df1642a 100644 --- a/crypto/openssl/crypto/conf/conf_mod.c +++ b/crypto/openssl/crypto/conf/conf_mod.c @@ -582,8 +582,14 @@ int CONF_parse_list(const char *list_, int sep, int nospc, { int ret; const char *lstart, *tmpend, *p; - lstart = list_; + if(list_ == NULL) + { + CONFerr(CONF_F_CONF_PARSE_LIST, CONF_R_LIST_CANNOT_BE_NULL); + return 0; + } + + lstart = list_; for(;;) { if (nospc) |
