Merge branch 'nd/maint-compat-fnmatch-fix' into maint

gitster · gitster · commit 86ef7b37f921 · 2012-11-27T13:29:00.000-08:00
* nd/maint-compat-fnmatch-fix:
  compat/fnmatch: fix off-by-one character class's length check
diff --git a/compat/fnmatch/fnmatch.c b/compat/fnmatch/fnmatch.c
@@ -345,7 +345,7 @@ internal_fnmatch (pattern, string, no_leading_period, flags)
 
 		    for (;;)
 		      {
-			if (c1 == CHAR_CLASS_MAX_LENGTH)
+			if (c1 > CHAR_CLASS_MAX_LENGTH)
 			  /* The name is too long and therefore the pattern
 			     is ill-formed.  */
 			  return FNM_NOMATCH;

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ internal_fnmatch (pattern, string, no_leading_period, flags)`
`345`	`345`
`346`	`346`	`for (;;)`
`347`	`347`	`{`
`348`		`- if (c1 == CHAR_CLASS_MAX_LENGTH)`
	`348`	`+ if (c1 > CHAR_CLASS_MAX_LENGTH)`
`349`	`349`	`/* The name is too long and therefore the pattern`
`350`	`350`	`is ill-formed. */`
`351`	`351`	`return FNM_NOMATCH;`