nano-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v2] search: skip a match on the magic line, as it is a just conve


From: Benno Schulenberg
Subject: [PATCH v2] search: skip a match on the magic line, as it is a just convenience line
Date: Fri, 9 Sep 2022 12:55:49 +0200

As the magic line isn't really a line (it is not counted in the number
of lines read and written), and nothing is on it (not even a newline),
it doesn't make sense to allow any regex, like ^ or $, to match it.

This fixes https://savannah.gnu.org/bugs/?63034.
Indirectly-reported-by: Mike Scalora <mike@scalora.org>

Bug existed since before version 2.0.0.
---
 src/search.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/search.c b/src/search.c
index d759668b..57236667 100644
--- a/src/search.c
+++ b/src/search.c
@@ -222,8 +222,9 @@ int findnextstr(const char *needle, bool whole_word_only, 
int modus,
                                continue;
                        }
 #endif
-                       /* The match is valid. */
-                       break;
+                       /* When not on the magic line, the match is valid. */
+                       if (line->next || line->data[0])
+                               break;
                }
 
 #ifndef NANO_TINY
-- 
2.37.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]