aboutsummaryrefslogtreecommitdiff
path: root/crypto/conf
diff options
context:
space:
mode:
authorDavid Lloyd <david.lloyd@fsmail.net>2014-07-07 13:11:48 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-07-07 13:19:57 +0100
commit9d23f422a32cb333a5e803199ae230706b1bf9f5 (patch)
tree1453cbea522db46159c5418d0c13a5c2f3f66c76 /crypto/conf
parentb73ac027357da29d9e393f24cd224999c94028d1 (diff)
downloadopenssl-9d23f422a32cb333a5e803199ae230706b1bf9f5.zip
openssl-9d23f422a32cb333a5e803199ae230706b1bf9f5.tar.gz
openssl-9d23f422a32cb333a5e803199ae230706b1bf9f5.tar.bz2
Prevent infinite loop loading config files.
PR#2985
Diffstat (limited to 'crypto/conf')
-rw-r--r--crypto/conf/conf_def.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index cf95132..f0b2768 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -321,7 +321,7 @@ again:
p=eat_ws(conf, end);
if (*p != ']')
{
- if (*p != '\0')
+ if (*p != '\0' && ss != p)
{
ss=p;
goto again;