SF.net SVN: geany: [2769] branches/editor-struct

[ntrel at users.sourceforge.net]

Revision: 2769
          http://geany.svn.sourceforge.net/geany/?rev=2769&view=rev
Author:   ntrel
Date:     2008-07-11 07:25:26 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
Fix segfault in update_type_keywords().

Modified Paths:
--------------
    branches/editor-struct/ChangeLog
    branches/editor-struct/src/document.c

Modified: branches/editor-struct/ChangeLog
===================================================================
--- branches/editor-struct/ChangeLog	2008-07-11 14:11:53 UTC (rev 2768)
+++ branches/editor-struct/ChangeLog	2008-07-11 14:25:26 UTC (rev 2769)
@@ -5,6 +5,8 @@
    checks for doc->editor->scintilla != NULL will segfault for invalid
    documents - check against doc->is_valid or doc->editor != NULL
    instead.
+ * src/document.c:
+   Fix segfault in update_type_keywords().
 
 
 2008-07-08  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: branches/editor-struct/src/document.c
===================================================================
--- branches/editor-struct/src/document.c	2008-07-11 14:11:53 UTC (rev 2768)
+++ branches/editor-struct/src/document.c	2008-07-11 14:25:26 UTC (rev 2769)
@@ -2044,10 +2044,9 @@
 
 	for (n = 0; n < documents_array->len; n++)
 	{
-		ScintillaObject *wid = documents[n]->editor->scintilla;
-
-		if (wid)
+		if (documents[n]->is_valid)
 		{
+			ScintillaObject *wid = documents[n]->editor->scintilla;
 			gint keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(wid));
 
 			if (keyword_idx > 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.