@matheusbsbs / matheus-bagliano / commits / ab3aebc15c

dir.c::match_pathname(): pay attention to the length of string parameters

This function takes two counted strings: a <pattern, patternlen> pair and a <pathname, pathlen> pair. But we end up feeding the result to fnmatch, which expects NUL-terminated strings. We can fix this by calling the fnmatch_icase_mem function, which handles re-allocating into a NUL-terminated string if necessary. While we're at it, we can avoid even calling fnmatch in some cases. In addition to patternlen, we get "prefix", the size of the pattern that contains no wildcard characters. We do a straight match of the prefix part first, and then use fnmatch to cover the rest. But if there are no wildcards in the pattern at all, we do not even need to call fnmatch; we would simply be comparing two empty strings. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 28, 2013 at 17:48 UTC ab3aebc15c13d083013591777688cecbcb703fb2

1 file changed +12 -1

dir.c

+12 -1

@@ -624,11 +624,22 @@ int match_pathname(const char *pathname, int pathlen,

624 if (strncmp_icase(pattern, name, prefix))

625 return 0;

626 pattern += prefix;

627 + patternlen -= prefix;

628 name += prefix;

629 namelen -= prefix;

630 +

631 + /*

632 + * If the whole pattern did not have a wildcard,

633 + * then our prefix match is all we need; we

634 + * do not need to call fnmatch at all.

635 + */

636 + if (!patternlen && !namelen)

637 + return 1;

638 }

639

631 - return fnmatch_icase(pattern, name, FNM_PATHNAME) == 0;

640 + return fnmatch_icase_mem(pattern, patternlen,

641 + name, namelen,

642 + FNM_PATHNAME) == 0;

643 }

644

645 /* Scan the list and let the last match determine the fate.