commit c82087b31fdba0e6b51f2d176bbb2a6805689afb
author Adam Langley <agl@chromium.org> Thu Jul 24 18:04:02 2014 -0700
committer Adam Langley <agl@chromium.org> Mon Jul 28 17:05:13 2014 -0700
tree a4d754245a9542f7d2dec81b702c5e31f33185f0
parent 887b1c3d492bdbfffc5d7c11bc50887c37a98733

Prevent infinite loop loading config files.

PR#2985

(Imported from upstream's 2cb761c1f4e0155743f4414932b5cff167389cf4)

Change-Id: I3e4f3c0c558dd2e1cc5ed2df1651834018627342

crypto/conf/conf.c

diff --git a/crypto/conf/conf.c b/crypto/conf/conf.c
index 898a9ba..1630c93 100644
--- a/crypto/conf/conf.c
+++ b/crypto/conf/conf.c
@@ -583,7 +583,7 @@
       end = eat_alpha_numeric(conf, ss);
       p = eat_ws(conf, end);
       if (*p != ']') {
-        if (*p != '\0') {
+        if (*p != '\0' && ss != p) {
           ss = p;
           goto again;
         }