Verifying that there exists multidata for the found starting line

before trying to use this multidata -- when a file is inserted, all
its lines will not have any multidata associated with them.

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

diff --git a/ChangeLog b/ChangeLog
index 209ba0067852c6d3cf596a98c1931aa24011a040..31e8f1480e314d832c266e02eeb3df75eac8cdcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-23  Benno Schulenberg  <bensberg@justemail.net>
+       * src/winio.c (edit_draw): Verify that there exists multidata for the
+       found starting line before trying to use it.  When a file is inserted
+       (^R), it will not have any precalculated multidata associated with it.
+       This fixes Savannah bug #45377 reported by Cody A. Taylor.
+
 2015-06-20  Benno Schulenberg  <bensberg@justemail.net>
        * src/search.c (do_research): If nothing was searched for yet during
        this run of nano, take the most recent item from the search history.

diff --git a/src/winio.c b/src/winio.c
index b8f918bd3c9ad6ac5fb31bd20b622c2f6cc9a7c9..c152b64c19f56b36be6b2780425cb34e53bcc547 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2602,7 +2602,7 @@ void edit_draw(filestruct *fileptr, const char *converted, int
 
                /* If the found start has been qualified as an end earlier,
                 * believe it and skip to the next step. */
-               if (start_line != NULL &&
+               if (start_line != NULL && start_line->multidata != NULL &&
                        start_line->multidata[tmpcolor->id] == CBEGINBEFORE)
                    goto step_two;