Config file parsing: Fix bug when there are comments at the end

Signed-off-by: Roopesh Chander <roop@roopc.net>
2019-01-24 16:23:07 +05:30
parent 2fe9f83ba5
commit 812e660491
1 changed files with 28 additions and 28 deletions
@@ -54,10 +54,9 @@ extension TunnelConfiguration {
            }

            trimmedLine = trimmedLine.trimmingCharacters(in: .whitespaces)
+            let lowercasedLine = trimmedLine.lowercased()

-            guard !trimmedLine.isEmpty else { continue }
-            let lowercasedLine = line.lowercased()
-
+            if !trimmedLine.isEmpty {
                if let equalsIndex = line.firstIndex(of: "=") {
                    // Line contains an attribute
                    let keyWithCase = line[..<equalsIndex].trimmingCharacters(in: .whitespaces)
@@ -87,6 +86,7 @@ extension TunnelConfiguration {
                } else if lowercasedLine != "[interface]" && lowercasedLine != "[peer]" {
                    throw ParseError.invalidLine(line)
                }
+            }

            let isLastLine = lineIndex == lines.count - 1