SF.net SVN: geany:[5212] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Thu Sep 9 14:28:55 UTC 2010


Revision: 5212
          http://geany.svn.sourceforge.net/geany/?rev=5212&view=rev
Author:   ntrel
Date:     2010-09-09 14:28:54 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
Fix possible NULL dereference.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tagmanager/tm_symbol.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-09-09 11:58:55 UTC (rev 5211)
+++ trunk/ChangeLog	2010-09-09 14:28:54 UTC (rev 5212)
@@ -7,6 +7,8 @@
    geany.glade:
    Add Find Usage and Go to Tag items to Search menu for easier
    discovery.
+ * tagmanager/tm_symbol.c:
+   Fix possible NULL dereference.
 
 
 2010-09-09  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/tagmanager/tm_symbol.c
===================================================================
--- trunk/tagmanager/tm_symbol.c	2010-09-09 11:58:55 UTC (rev 5211)
+++ trunk/tagmanager/tm_symbol.c	2010-09-09 14:28:54 UTC (rev 5212)
@@ -103,8 +103,10 @@
 {
 	gint s1, s2;
 
-	if ((!t1 && !t2) || (!*t1 && !*t2))
+	if (!t1 && !t2)
 		return 0;
+	if (t1 && t2 && !*t1 && !*t2)
+		return 0;
 	else if (!t1 || !*t1)
 		return -1;
 	else if (!t2 || !*t2)


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



More information about the Commits mailing list