SF.net SVN: geany:[4835] trunk

[eht16 at users.sourceforge.net]

Revision: 4835
          http://geany.svn.sourceforge.net/geany/?rev=4835&view=rev
Author:   eht16
Date:     2010-04-18 21:42:58 +0000 (Sun, 18 Apr 2010)

Log Message:
-----------
Backport a fix from CTags SVN to prevent possible crashes by trying to free NULL pointers.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-18 21:42:49 UTC (rev 4834)
+++ trunk/ChangeLog	2010-04-18 21:42:58 UTC (rev 4835)
@@ -9,6 +9,8 @@
    Use tm_source_file_set_tag_arglist() to set the argument list
    field of Python class tags to the argument list of their
    __init__() methods.
+   Backport a fix from CTags SVN to prevent possible crashes by trying
+   to free NULL pointers.
 
 
 2010-04-17  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/tagmanager/python.c
===================================================================
--- trunk/tagmanager/python.c	2010-04-18 21:42:49 UTC (rev 4834)
+++ trunk/tagmanager/python.c	2010-04-18 21:42:58 UTC (rev 4835)
@@ -355,7 +355,8 @@
 	cp = parseIdentifier (cp, def);
 	arglist = parseArglist (cp);
 	makeFunctionTag (def, parent, is_class_parent, arglist);
-	eFree (arglist);
+	if (arglist != NULL)
+		eFree (arglist);
 }
 
 /* Get the combined name of a nested symbol. Classes are separated with ".",
@@ -747,7 +748,8 @@
 				/* show class members or top-level script lambdas only */
 				if (parent_is_class || vStringLength(parent) == 0)
 					makeFunctionTag (name, parent, parent_is_class, arglist);
-				eFree (arglist);
+				if (arglist != NULL)
+					eFree (arglist);
 			}
 			else
 			{


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