From 9ca6da485c93ced9616bfc8d96df54e7d939b221 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Wed, 3 Oct 2018 15:15:25 +0200
Subject: Handle None values in lessThan

---
 doc/changelog.asciidoc                        | 1 +
 qutebrowser/completion/models/listcategory.py | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index aa067469a..c6d8116ba 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -100,6 +100,7 @@ Fixed
 - Crash when trying to load an empty session file.
 - `:hint` with an invalid `--mode=` value now shows a proper error.
 - Rare crash on Qt 5.11.2 when clicking on `<select>` elements.
+- Rare crash related to the completion.
 
 Removed
 ~~~~~~~
diff --git a/qutebrowser/completion/models/listcategory.py b/qutebrowser/completion/models/listcategory.py
index 13bc1e6b2..ac0d0cdd0 100644
--- a/qutebrowser/completion/models/listcategory.py
+++ b/qutebrowser/completion/models/listcategory.py
@@ -24,7 +24,7 @@ import re
 from PyQt5.QtCore import Qt, QSortFilterProxyModel, QRegExp
 from PyQt5.QtGui import QStandardItem, QStandardItemModel
 
-from qutebrowser.utils import qtutils
+from qutebrowser.utils import qtutils, log
 
 
 class ListCategory(QSortFilterProxyModel):
@@ -80,6 +80,13 @@ class ListCategory(QSortFilterProxyModel):
         left = self.srcmodel.data(lindex)
         right = self.srcmodel.data(rindex)
 
+        if left is None or right is None:
+            log.completion.warning("Got unexpected None value, "
+                                   "left={!r} right={!r} "
+                                   "lindex={!r} rindex={!r}"
+                                   .format(left, right, lindex, rindex))
+            return False
+
         leftstart = left.startswith(self._pattern)
         rightstart = right.startswith(self._pattern)
 
-- 
cgit v1.2.3-54-g00ecf