attr: drop misguided defensive coding
In prepare_attr_stack, we pop the old elements of the stack (which were left from a previous lookup and may or may not be useful to us). Our loop to do so checks that we never reach the top of the stack. However, the code immediately afterwards will segfault if we did actually reach the top of the stack. Fortunately, this is not an actual bug, since we will never pop all of the stack elements (we will always keep the root gitattributes, as well as the builtin ones). So the extra check in the loop condition simply clutters the code and makes the intent less clear. Let's get rid of it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 10, 2012 at 14:32 UTC
77f7f822889411bfede0507dd60aebf11edb2849
1 file changed
+1
-1
attr.c
+1
-1
@@ -568,7 +568,7 @@ static void prepare_attr_stack(const char *path, int dirlen)
568
* Pop the ones from directories that are not the prefix of
569
* the path we are checking.
570
*/
571
- while (attr_stack && attr_stack->origin) {
571
+ while (attr_stack->origin) {
572
int namelen = strlen(attr_stack->origin);
573
574
elem = attr_stack;