SF.net SVN: geany:[5004] trunk

[eht16 at users.sourceforge.net]

Revision: 5004
          http://geany.svn.sourceforge.net/geany/?rev=5004&view=rev
Author:   eht16
Date:     2010-06-06 18:02:49 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Fix crash when trying to sort NULL pointers as tags in the Symbols list (closes #3011986).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-06-06 17:21:52 UTC (rev 5003)
+++ trunk/ChangeLog	2010-06-06 18:02:49 UTC (rev 5004)
@@ -5,6 +5,9 @@
  * src/sidebar.c:
    Fix reducing paths to project name in the Documents list
    (patch by Eugene Arshinov, thanks).
+ * src/symbols.c:
+   Fix crash when trying to sort NULL pointers as tags in the Symbols
+   list (closes #3011986).
 
 
 2010-06-04  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2010-06-06 17:21:52 UTC (rev 5003)
+++ trunk/src/symbols.c	2010-06-06 18:02:49 UTC (rev 5004)
@@ -1251,6 +1251,12 @@
 		}
 		else
 		{
+			/* this is what g_strcmp0() does */
+			if (! astr)
+				return -(astr != bstr);
+			if (! bstr)
+				return astr != bstr;
+
 			cmp = strcmp(astr, bstr);
 
 			/* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */


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