From 7c635975d1b48937ff040ec515d9e05aa62b3edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Kuczborski?= Date: Fri, 9 Apr 2021 22:51:55 +0200 Subject: [PATCH] Fix for crashing range indexes when variable length is 1 --- Sources/Variable.swift | 1 + Tests/StencilTests/VariableSpec.swift | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Sources/Variable.swift b/Sources/Variable.swift index 2da56d9..9d47651 100644 --- a/Sources/Variable.swift +++ b/Sources/Variable.swift @@ -50,6 +50,7 @@ public struct Variable: Equatable, Resolvable { public func resolve(_ context: Context) throws -> Any? { if (variable.hasPrefix("'") && variable.hasSuffix("'")) || (variable.hasPrefix("\"") && variable.hasSuffix("\"")) { // String literal + guard variable.count > 1 else { return "" } return String(variable[variable.index(after: variable.startIndex) ..< variable.index(before: variable.endIndex)]) } diff --git a/Tests/StencilTests/VariableSpec.swift b/Tests/StencilTests/VariableSpec.swift index 6445deb..da712ce 100644 --- a/Tests/StencilTests/VariableSpec.swift +++ b/Tests/StencilTests/VariableSpec.swift @@ -63,13 +63,25 @@ final class VariableTests: XCTestCase { let result = try variable.resolve(self.context) as? String try expect(result) == "name" } + + it("can resolve a string literal with one double quote") { + let variable = Variable("\"") + let result = try variable.resolve(self.context) as? String + try expect(result) == "" + } it("can resolve a string literal with single quotes") { let variable = Variable("'name'") let result = try variable.resolve(self.context) as? String try expect(result) == "name" } - + + it("can resolve a string literal with one single quote") { + let variable = Variable("'") + let result = try variable.resolve(self.context) as? String + try expect(result) == "" + } + it("can resolve an integer literal") { let variable = Variable("5") let result = try variable.resolve(self.context) as? Int