Backport r5362 from trunk.

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_4_branch@5417 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index b9302b1f22a6625f95119dbde914462bb6f1bfde..3489d7201c6c80c9b6b459d0b05373a7b0c7385c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-14  Benno Schulenberg  <bensberg@justemail.net>
+       * src/help.c (help_line_len): The wrap location can be beyond the EOL,
+       so for determining the length of the current line, don't start at that
+       location but at the beginning.  This fixes Savannah bug #45770.
+
 2015-08-13  Benno Schulenberg  <bensberg@justemail.net>
        * src/search.c (do_find_bracket): Remove mistaken comparison between
        pointer and literal character.  Found with cppcheck.

diff --git a/src/help.c b/src/help.c
index 1d4d758ce690611c560feae0d9cc57913bd5c00c..7efef8e2edc1eb7c5473fd8a69573177e0001636 100644 (file)
--- a/src/help.c
+++ b/src/help.c
@@ -507,6 +507,8 @@ size_t help_line_len(const char *ptr)
     size_t retval = (wrap_loc < 0) ? 0 : wrap_loc;
     size_t retval_save = retval;
 
+    retval = 0;
+
     /* Get the length of the entire line up to a null or a newline. */
     while (*(ptr + retval) != '\0' && *(ptr + retval) != '\n')
        retval += move_mbright(ptr + retval, 0);