Blame SOURCES/ctags-5.7-segment-fault.patch
|
 |
27fdeb |
diff -ruN -x '*~' ctags-5.7/vim.c ctags-5.7/vim.c
|
|
|
27fdeb |
--- ctags-5.7/vim.c 2006-10-26 12:06:21.000000000 +0900
|
|
|
27fdeb |
+++ ctags-5.7/vim.c 2009-08-28 22:21:31.000000000 +0900
|
|
|
27fdeb |
@@ -328,7 +328,7 @@
|
|
|
27fdeb |
*/
|
|
|
27fdeb |
const unsigned char *cp = line;
|
|
|
27fdeb |
|
|
|
27fdeb |
- if ( (int) *cp == '\\' )
|
|
|
27fdeb |
+ if ( cp && ( (int) *cp == '\\' ) )
|
|
|
27fdeb |
{
|
|
|
27fdeb |
/*
|
|
|
27fdeb |
* We are recursively calling this function is the command
|
|
|
27fdeb |
@@ -350,9 +350,10 @@
|
|
|
27fdeb |
while (*cp && isspace ((int) *cp))
|
|
|
27fdeb |
++cp;
|
|
|
27fdeb |
}
|
|
|
27fdeb |
- else if ( (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) &&
|
|
|
27fdeb |
- (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) &&
|
|
|
27fdeb |
- (strncmp ((const char*) line, "com", (size_t) 3) == 0) )
|
|
|
27fdeb |
+ else if ( line &&
|
|
|
27fdeb |
+ (!strncmp ((const char*) line, "comp", (size_t) 4) == 0) &&
|
|
|
27fdeb |
+ (!strncmp ((const char*) line, "comc", (size_t) 4) == 0) &&
|
|
|
27fdeb |
+ (strncmp ((const char*) line, "com", (size_t) 3) == 0) )
|
|
|
27fdeb |
{
|
|
|
27fdeb |
cp += 2;
|
|
|
27fdeb |
if ((int) *++cp == 'm' && (int) *++cp == 'a' &&
|
|
|
27fdeb |
@@ -394,6 +395,14 @@
|
|
|
27fdeb |
while (*cp && !isspace ((int) *cp))
|
|
|
27fdeb |
++cp;
|
|
|
27fdeb |
}
|
|
|
27fdeb |
+ else if (!isalnum ((int) *cp))
|
|
|
27fdeb |
+ {
|
|
|
27fdeb |
+ /*
|
|
|
27fdeb |
+ * Broken syntax: throw away this line
|
|
|
27fdeb |
+ */
|
|
|
27fdeb |
+ cmdProcessed = TRUE;
|
|
|
27fdeb |
+ goto cleanUp;
|
|
|
27fdeb |
+ }
|
|
|
27fdeb |
} while ( *cp && !isalnum ((int) *cp) );
|
|
|
27fdeb |
|
|
|
27fdeb |
if ( ! *cp )
|