From a4b64dec391bdb9aa71d3aacdb6db46fa88acd40 Mon Sep 17 00:00:00 2001 From: Alan Fischer Date: Tue, 3 Oct 2017 23:51:08 -0600 Subject: [PATCH] Properly handle an invalid end_time (#9675) --- homeassistant/components/history.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/history.py b/homeassistant/components/history.py index 9863e823e06..5904a99e43c 100644 --- a/homeassistant/components/history.py +++ b/homeassistant/components/history.py @@ -283,9 +283,10 @@ class HistoryPeriodView(HomeAssistantView): end_time = request.query.get('end_time') if end_time: - end_time = dt_util.as_utc( - dt_util.parse_datetime(end_time)) - if end_time is None: + end_time = dt_util.parse_datetime(end_time) + if end_time: + end_time = dt_util.as_utc(end_time) + else: return self.json_message('Invalid end_time', HTTP_BAD_REQUEST) else: end_time = start_time + one_day