Revision: 5200 http://geany.svn.sourceforge.net/geany/?rev=5200&view=rev Author: ntrel Date: 2010-08-25 16:40:47 +0000 (Wed, 25 Aug 2010)
Log Message: ----------- Backport fix for possible infinite loop from CTags.
Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/make.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-25 11:44:33 UTC (rev 5199) +++ trunk/ChangeLog 2010-08-25 16:40:47 UTC (rev 5200) @@ -7,6 +7,8 @@ found. Remove checks for HAVE_REGCOMP in Geany source (not TagManager) - regex support is required. + * tagmanager/make.c: + Backport fix for possible infinite loop from CTags.
2010-08-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/tagmanager/make.c =================================================================== --- trunk/tagmanager/make.c 2010-08-25 11:44:33 UTC (rev 5199) +++ trunk/tagmanager/make.c 2010-08-25 16:40:47 UTC (rev 5200) @@ -157,7 +157,7 @@ ++matchLevel; else if (c == end) --matchLevel; - else if (c == '\n') + else if (c == '\n' || c == EOF) break; } if (c == EOF) @@ -272,7 +272,7 @@
extern parserDefinition* MakefileParser (void) { - static const char *const patterns [] = { "[Mm]akefile", NULL }; + static const char *const patterns [] = { "[Mm]akefile", "GNUmakefile", NULL }; static const char *const extensions [] = { "mak", "mk", NULL }; parserDefinition* const def = parserNew ("Make"); def->kinds = MakeKinds;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.