summaryrefslogtreecommitdiffstats
path: root/crypto
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:51:07 +0100
commitcfd2aeeb7ce6827d14752f8e754b634ddfb1bd6a (patch)
tree8709d872d648c8dc8d0f696f986105f0a62fe727 /crypto
parenta0fdc4c6d657538b6a2c0b84e8bf06ab676854c4 (diff)
Prevent infinite loop loading config files.
PR#2985 (cherry picked from commit 9d23f422a32cb333a5e803199ae230706b1bf9f5)
Diffstat (limited to 'crypto')
-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 3c58936d99..a168339b7d 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -324,7 +324,7 @@ again:
p=eat_ws(conf, end);
if (*p != ']')
{
- if (*p != '\0')
+ if (*p != '\0' && ss != p)
{
ss=p;
goto again;