search: avoid infinite look with inconsistent doc:step function.

If doc:step moves back further than we expect, search_backwards can loop
forever. So check for that possibility and abort.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/DOC/TODO.md b/DOC/TODO.md
index f7985f12c600adcda4c3eba89428620c9c2f3af5..802538486948190a49b1ac914eceb3966136e97f 100644 (file)
--- a/DOC/TODO.md
+++ b/DOC/TODO.md
@@ -55,6 +55,10 @@ Current priorities
 Bugs to be fixed
 ----------------
 
+- [ ] transparent images appear in email with horiz lines
+- [ ] Replying to w3m/html mail results in unsightly markup in reply
+- [ ] redefining doc:char but not doc:content in mail-compose causes
+      search to get confused.  What should we do?
 - [ ] why doesn't doc-to-text auto-load
 - [ ] use mimetypes.guess_type() to interpret filenames in email attachments??
 - [ ] don't allow non-text email parts to appear as text.  Maybe hex??

diff --git a/lib-search.c b/lib-search.c
index 716557f6c2c4f7fc544bf606fa7ea422f556206c..ed5bb1150afa9486e8e0e7dd002f0f6c75c9eabd 100644 (file)
--- a/lib-search.c
+++ b/lib-search.c
@@ -325,6 +325,13 @@ static int search_backward(struct pane *p safe,
                if (mark_ordered_not_same(end, ss.endmark))
                        break;
                ret = maxlen;
+               if (endmark != ss.endmark &&
+                   mark_ordered_or_same(ss.endmark, endmark))
+                       /* Didn't move forward!!  Presumably
+                        * buggy doc:step implementation.
+                        */
+                       break;
+
                mark_to_mark(endmark, ss.endmark);
                ss.endmark = m;
                mark_to_mark(start, endmark);