aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsean <seanlkml@sympatico.ca>2006-05-05 09:49:15 -0400
committerJunio C Hamano <junkio@cox.net>2006-05-05 14:33:58 -0700
commit93ddef3e2dd5f7f3238fad9d52e974d03c7844f2 (patch)
tree7afb0223c5ca77620f9073c7246ba78362784a7b
parent7abd7117ec57b8c3c2a469db62c7811fdac5c655 (diff)
downloadgit-93ddef3e2dd5f7f3238fad9d52e974d03c7844f2.tar.gz
git-93ddef3e2dd5f7f3238fad9d52e974d03c7844f2.tar.xz
Fix for config file section parsing.
Currently, if the target key has a section that matches the initial substring of another section we mistakenly believe we've found the correct section. To avoid this problem, ensure that the section lengths are identical before comparison. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--config.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/config.c b/config.c
index 4e1f0c228..a3e14d76e 100644
--- a/config.c
+++ b/config.c
@@ -335,8 +335,9 @@ static int store_aux(const char* key, const char* value)
store.offset[store.seen] = ftell(config_file);
store.state = KEY_SEEN;
store.seen++;
- } else if(!strncmp(key, store.key, store.baselen))
- store.state = SECTION_SEEN;
+ } else if (strrchr(key, '.') - key == store.baselen &&
+ !strncmp(key, store.key, store.baselen))
+ store.state = SECTION_SEEN;
}
return 0;
}