* Fix for crashing in help menu when using certain locales

         from Mitsuya Shibata <mty.shibata@gmail.com> (Savannah bug
         23751)

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

diff --git a/ChangeLog b/ChangeLog
index 9a7739086e41b75a9116a8648526286cad636d08..1c20a611a1625ab7a39f53a9d9536da095aa1cab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ CVS code -
          Jojo <jojowil@hvcc.edu>
 - nano.c:
        - Fix for segfault on resize by Andreas Amann <andreas.amann@tyndall.ie>
+- text.c:
+       * Fix for crashing in help menu when using certain locales
+         from Mitsuya Shibata <mty.shibata@gmail.com> (Savannah bug 
+         23751)
 
 GNU nano 2.0.7 - 2007.12.20
 - General:

diff --git a/src/text.c b/src/text.c
index ac6f473e7ab8a67beca8fa21a409b1af023f7317..74f558897f502d3b491fa92ca611d65e27805747 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -800,6 +800,15 @@ ssize_t break_line(const char *line, ssize_t goal
        /* In fact, the whole line displays shorter than goal. */
        return cur_loc;
 
+#ifndef DISABLE_HELP
+    if (newln && blank_loc <= 0) {
+       /* If blank was not found or was found only first character,
+        * force line break. */
+       cur_loc -= line_len;
+       return cur_loc;
+    }
+#endif
+
     if (blank_loc == -1) {
        /* No blank was found that was short enough. */
        bool found_blank = FALSE;