summaryrefslogtreecommitdiffstats
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:50:00 +0100
commit00032b0ba1e5f9d5f64f4a868a666abce3f63870 (patch)
treebbe3c59a3c847aea862f3c978cbdb7322645c2e4 /crypto/conf
parenta07f514fc02b09c854ce857a8df828d29f7121d3 (diff)
Prevent infinite loop loading config files.
PR#2985 (cherry picked from commit 9d23f422a32cb333a5e803199ae230706b1bf9f5)
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 cf951320af..f0b2768739 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;