Revision: 3441 http://geany.svn.sourceforge.net/geany/?rev=3441&view=rev Author: eht16 Date: 2009-01-03 16:22:28 +0000 (Sat, 03 Jan 2009)
Log Message: ----------- Fix crash in Makefile parser when trying to read defines.
Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/make.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-03 16:22:09 UTC (rev 3440) +++ trunk/ChangeLog 2009-01-03 16:22:28 UTC (rev 3441) @@ -3,6 +3,8 @@ * src/support.h: Prevent compile errors in plugins when GETTEXT_PACKAGE is not defined. + * tagmanager/make.c: + Fix crash in Makefile parser when trying to read defines.
2009-01-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/tagmanager/make.c =================================================================== --- trunk/tagmanager/make.c 2009-01-03 16:22:09 UTC (rev 3440) +++ trunk/tagmanager/make.c 2009-01-03 16:22:28 UTC (rev 3441) @@ -110,8 +110,12 @@ static void newMacroFromDefine (vString *const name) { /* name is something like "define JAVAHPP_RULE", find the space and jump to the next char */ - vStringCopyS (name, strchr (vStringValue (name), ' ') + 1); - makeSimpleTag (name, MakeKinds, K_MACRO); + char *name_val = strchr (vStringValue (name), ' '); + + if (name_val != NULL) { + vStringCopyS (name, name_val + 1); + makeSimpleTag (name, MakeKinds, K_MACRO); + } }
static void readIdentifier (const int first, vString *const id)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.