ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
Benno Schulenberg 2015-06-23 18:06:30 +00:00
parent 4499520c03
commit 75ac24b25e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2015-06-20 Benno Schulenberg <bensberg@justemail.net>
* src/search.c (do_research): If nothing was searched for yet during * 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. this run of nano, take the most recent item from the search history.

2
src/winio.c
View File

@ -2602,7 +2602,7 @@ void edit_draw(filestruct *fileptr, const char *converted, int
/* If the found start has been qualified as an end earlier, /* If the found start has been qualified as an end earlier,
* believe it and skip to the next step. */ * 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) start_line->multidata[tmpcolor->id] == CBEGINBEFORE)
goto step_two; goto step_two;