From 1c2b01a51e1683efddc678edf046688c280a851b Mon Sep 17 00:00:00 2001
From: hius07 <62179190+hius07@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:18:03 +0200
Subject: [PATCH] Bookmarks: fix compare invalid xpointers (#8690)

---
 frontend/apps/reader/modules/readerbookmark.lua | 13 ++++++++-----
 frontend/document/credocument.lua               |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/apps/reader/modules/readerbookmark.lua b/frontend/apps/reader/modules/readerbookmark.lua
index 1c7f612e6..7395a471a 100644
--- a/frontend/apps/reader/modules/readerbookmark.lua
+++ b/frontend/apps/reader/modules/readerbookmark.lua
@@ -232,13 +232,16 @@ function ReaderBookmark:isBookmarkInPositionOrder(a, b)
         local b_page = self.ui.document:getPageFromXPointer(b.page)
         if a_page == b_page then -- both bookmarks in the same page
             local compare_xp = self.ui.document:compareXPointers(a.page, b.page)
-            if compare_xp == 0 then -- both bookmarks with the same start
-                if a.highlighted and b.highlighted then -- both are highlights, compare ends
-                    return self.ui.document:compareXPointers(a.pos1, b.pos1) < 0
+            if compare_xp then
+                if compare_xp == 0 then -- both bookmarks with the same start
+                    if a.highlighted and b.highlighted then -- both are highlights, compare ends
+                        return self.ui.document:compareXPointers(a.pos1, b.pos1) < 0
+                    end
+                    return a.highlighted -- have page bookmarks before highlights
                 end
-                return a.highlighted -- have page bookmarks before highlights
+                return compare_xp < 0
             end
-            return compare_xp < 0
+            -- if compare_xp is nil, some xpointer is invalid and will be sorted first to page 1
         end
         return a_page > b_page
     end
diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index 93b6574fd..84742f5e9 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -643,6 +643,7 @@ end
 
 function CreDocument:compareXPointers(xp1, xp2)
     -- Returns 1 if XPointers are ordered (if xp2 is after xp1), -1 if not, 0 if same
+    -- Returns nil if any of XPointers are invalid
     return self._document:compareXPointers(xp1, xp2)
 end