Revision: 1417 http://svn.sourceforge.net/geany/?rev=1417&view=rev Author: ntrel Date: 2007-03-24 05:10:43 -0700 (Sat, 24 Mar 2007)

Log Message: ----------- Fix segfault when pressing ctrl-enter when there are no workspace tags (thanks to R8Rooy for reporting).

Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c trunk/src/symbols.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-23 16:47:27 UTC (rev 1416) +++ trunk/ChangeLog 2007-03-24 12:10:43 UTC (rev 1417) @@ -1,3 +1,10 @@ +2007-03-24 Nick Treleaven nick.treleaven@btinternet.com + + * src/sci_cb.c, src/symbols.c: + Fix segfault when pressing ctrl-enter when there are no workspace + tags (thanks to R8Rooy for reporting). + + 2007-03-23 Nick Treleaven nick.treleaven@btinternet.com

* src/dialogs.c:

Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-03-23 16:47:27 UTC (rev 1416) +++ trunk/src/sci_cb.c 2007-03-24 12:10:43 UTC (rev 1417) @@ -1159,6 +1159,8 @@ if (sci == NULL) return;

words = symbols_get_macro_list(); + if (words == NULL) return; + SSM(sci, SCI_USERLISTSHOW, 1, (sptr_t) words->str); g_string_free(words, TRUE); }

Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-03-23 16:47:27 UTC (rev 1416) +++ trunk/src/symbols.c 2007-03-24 12:10:43 UTC (rev 1417) @@ -200,6 +200,9 @@ GPtrArray *ftags; GString *words;

+ if (app->tm_workspace->work_objects == NULL) + return NULL; + ftags = g_ptr_array_sized_new(50); words = g_string_sized_new(200);

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