From mboxrd@z Thu Jan 1 00:00:00 1970 From: Libor Pechacek Subject: [PATCH v3] Disallow empty section and variable names Date: Mon, 31 Jan 2011 14:08:56 +0100 Message-ID: <20110131130855.GC24297@fm.suse.cz> References: <20110108144644.GA11019@localhost.suse.cz> <20110127145253.GD6312@fm.suse.cz> <20110130203445.GA9689@fm.suse.cz> <4D46694F.5070208@viscovery.net> <20110131091728.GB24297@fm.suse.cz> <4D468109.8020409@viscovery.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Johannes Sixt To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Jan 31 14:09:05 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PjtV9-0006jo-5r for gcvg-git-2@lo.gmane.org; Mon, 31 Jan 2011 14:09:03 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755536Ab1AaNI6 (ORCPT ); Mon, 31 Jan 2011 08:08:58 -0500 Received: from cantor.suse.de ([195.135.220.2]:51475 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755448Ab1AaNI5 (ORCPT ); Mon, 31 Jan 2011 08:08:57 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 4805493F19; Mon, 31 Jan 2011 14:08:56 +0100 (CET) Content-Disposition: inline In-Reply-To: <4D468109.8020409@viscovery.net> User-Agent: Mutt/1.5.18-muttng (2008-05-17-r1399) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: It is possible to break your repository config by creating an invalid key. The config parser in turn chokes on it. $ git init Initialized empty Git repository in /tmp/gittest/.git/ $ git config .foo false $ git config core.bare fatal: bad config file line 6 in .git/config This patch makes git-config reject keys which start or end with a dot, adds tests for these cases and also fixes a typo in t5526-fetch-submodules, which was exposed by the new check. Signed-off-by: Libor Pechacek Cc: Johannes Sixt --- Incoporated feedback from Johannes, introduced keylen local variable to improve readability of the code. Applies on top "Sanity-check config variable names". config.c | 10 ++++++++-- t/t1300-repo-config.sh | 4 ++++ t/t5526-fetch-submodules.sh | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/config.c b/config.c index fde91f5..5eb89a7 100644 --- a/config.c +++ b/config.c @@ -1113,6 +1113,7 @@ int git_config_set(const char *key, const char *value) int git_config_parse_key(const char *key, char **store_key, int *baselen_) { int i, dot, baselen; + int keylen = strlen(key); const char *last_dot = strrchr(key, '.'); /* @@ -1120,11 +1121,16 @@ int git_config_parse_key(const char *key, char **store_key, int *baselen_) * key name separated by a dot, we have to know where the dot is. */ - if (last_dot == NULL) { + if (last_dot == NULL || *key == '.') { error("key does not contain a section: %s", key); return -2; } + if (keylen && key[keylen-1] == '.') { + error("key does not contain variable name: %s", key); + return -2; + } + baselen = last_dot - key; if (baselen_) *baselen_ = baselen; @@ -1132,7 +1138,7 @@ int git_config_parse_key(const char *key, char **store_key, int *baselen_) /* * Validate the key and while at it, lower case it for matching. */ - *store_key = xmalloc(strlen(key) + 1); + *store_key = xmalloc(keylen + 1); dot = 0; for (i = 0; key[i]; i++) { diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index c3d91d1..53fb822 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -889,6 +889,10 @@ test_expect_success 'key sanity-checking' ' test_must_fail git config foo.1bar && test_must_fail git config foo."ba z".bar && + test_must_fail git config . false && + test_must_fail git config .foo false && + test_must_fail git config foo. false && + test_must_fail git config .foo. false && git config foo.bar true && git config foo."ba =z".bar false ' diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 884a5e5..7106c6c 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -124,7 +124,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti ( cd downstream && git fetch --recurse-submodules >../actual.out 2>../actual.err && - git config -f --unset .gitmodules submodule.submodule.fetchRecurseSubmodules true && + git config -f .gitmodules --unset submodule.submodule.fetchRecurseSubmodules true && git config --unset submodule.submodule.fetchRecurseSubmodules ) && test_cmp expect.out actual.out && -- 1.7.4.rc3.11.g863f7