2013-01-20 Chris Allegretta <chrisa@asty.org>

        * src/text.c (do_histify): Don't allow sigwinch to be received while justifying
          as that puts us into a wacky state.  Fixess crash on justify by Joshua Rogers.

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

diff --git a/ChangeLog b/ChangeLog
index 85622029bc95a7258c108903819da3d9a23a7117..5e3308adf51fb539fd3c2505292fbd35c4abf82f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-20 Chris Allegretta <chrisa@asty.org>
+        * src/text.c (do_histify): Don't allow sigwinch to be received while justifying
+          as that puts us into a wacky state.  Fixess crash on justify by Joshua Rogers.
+
 2013-01-19 Chris Allegretta <chrisa@asty.org>
         * configure.ac: Make ncursesw checking dependent on the presence of ncursesw.h, 
           since without the header files we can't compile.

diff --git a/src/text.c b/src/text.c
index d8f80887709904753c92a5017d524fbb559bee34..9bb7e4e0f2494ab8431c481354d49814218073ee 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -1979,6 +1979,8 @@ void do_justify(bool full_justify)
     if (full_justify)
        openfile->current = openfile->fileage;
 
+    allow_pending_sigwinch(FALSE);
+
     while (TRUE) {
        size_t i;
            /* Generic loop variable. */
@@ -2349,6 +2351,9 @@ void do_justify(bool full_justify)
     /* Display the shortcut list with UnCut. */
     shortcut_init(FALSE);
     display_main_list();
+
+    allow_pending_sigwinch(TRUE);
+
 }
 
 /* Justify the current paragraph. */