config: show missing section error correctly

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
PearShadow · Mar 13, 2020 · f5d2fd6 · f5d2fd6
1 parent 4d77bd8
commit f5d2fd6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/tunnel/src/main/java/com/wireguard/config/Config.java b/tunnel/src/main/java/com/wireguard/config/Config.java
@@ -69,6 +69,7 @@ public static Config parse(final BufferedReader reader)
         final Collection<String> peerLines = new ArrayList<>();
         boolean inInterfaceSection = false;
         boolean inPeerSection = false;
+        boolean seenInterfaceSection = false;
         @Nullable String line;
         while ((line = reader.readLine()) != null) {
             final int commentIndex = line.indexOf('#');
@@ -86,6 +87,7 @@ public static Config parse(final BufferedReader reader)
                 if ("[Interface]".equalsIgnoreCase(line)) {
                     inInterfaceSection = true;
                     inPeerSection = false;
+                    seenInterfaceSection = true;
                 } else if ("[Peer]".equalsIgnoreCase(line)) {
                     inInterfaceSection = false;
                     inPeerSection = true;
@@ -104,7 +106,7 @@ public static Config parse(final BufferedReader reader)
         }
         if (inPeerSection)
             builder.parsePeer(peerLines);
-        else if (!inInterfaceSection)
+        if (!seenInterfaceSection)
             throw new BadConfigException(Section.CONFIG, Location.TOP_LEVEL,
                     Reason.MISSING_SECTION, null);
         // Combine all [Interface] sections in the file.