Merge pull request #23 from ezfe/master

Fixed out-of-bounds crash with #date tag
vapor · Jun 21, 2018 · f7f0fea · f7f0fea
2 parents 241ec06 + 8e66399
commit f7f0fea
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Sources/TemplateKit/Tag/DateFormat.swift b/Sources/TemplateKit/Tag/DateFormat.swift
@@ -19,7 +19,11 @@ public final class DateFormat: TagRenderer {
         /// Assume the date is a floating point number
         let date = Date(timeIntervalSinceReferenceDate: tag.parameters[0].double ?? 0)
         /// Set format as the second param or default to ISO-8601 format.
-        formatter.dateFormat = tag.parameters[1].string ?? "yyyy-MM-dd HH:mm:ss"
+        if tag.parameters.count == 2, let param = tag.parameters[1].string {
+            formatter.dateFormat = param
+        } else {
+            formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        }
 
         /// Return formatted date
         return Future.map(on: tag) { .string(formatter.string(from: date)) }