2009-02-08 Chris Allegretta <chrisa@asty.org>

        * Add more multidata initliazers for new buffers and 'magic lines'.  Fixes segfaults
          with syntax highlighting in new buffers, initially reported by Mike Frysinger.

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

diff --git a/ChangeLog b/ChangeLog
index c2af11fa9ebc2731f1c355fe8888db1d00d03401..3d11a5cc330f662ceb43e2e96f47a72833585b1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-08 Chris Allegretta <chrisa@asty.org>
+       * Add more multidata initliazers for new buffers and 'magic lines'.  Fixes segfaults
+         with syntax highlighting in new buffers, initially reported by Mike Frysinger.
+
 GNU nano 2.1.8 - 2009.02.07
 2009-02-06 Chris Allegretta <chrisa@asty.org>
        * rcfile.c (parse_include): Abort on being unable to open an included rcfile.  Fixes

diff --git a/src/files.c b/src/files.c
index 2e95010b99dcb68944298da8efbebefbd09bec4e..ccd3c8dedab02cebb6211b0bd77eb8592fb98689 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -96,6 +96,10 @@ void initialize_buffer_text(void)
     openfile->edittop = openfile->fileage;
     openfile->current = openfile->fileage;
 
+#ifdef ENABLE_COLOR
+    openfile->fileage->multidata = NULL;
+#endif
+
     openfile->totsize = 0;
 }
 

diff --git a/src/utils.c b/src/utils.c
index 4ccfc95566c1dbc93b32e439c8cacfe090476588..3d7f069b1bea0f29d0301183c75f31506ce45408 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -542,6 +542,9 @@ void new_magicline(void)
     openfile->filebot->next->prev = openfile->filebot;
     openfile->filebot->next->next = NULL;
     openfile->filebot->next->lineno = openfile->filebot->lineno + 1;
+#ifdef ENABLE_COLOR
+    openfile->filebot->next->multidata = NULL;
+#endif
     openfile->filebot = openfile->filebot->next;
     openfile->totsize++;
 }