From patchwork Fri Aug 21 21:48:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 11730615 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 566141575 for ; Fri, 21 Aug 2020 21:48:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47F8D207DE for ; Fri, 21 Aug 2020 21:48:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726747AbgHUVsm (ORCPT ); Fri, 21 Aug 2020 17:48:42 -0400 Received: from mga12.intel.com ([192.55.52.136]:19358 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726433AbgHUVsk (ORCPT ); Fri, 21 Aug 2020 17:48:40 -0400 IronPort-SDR: MIo1j3Q8zUlsNk8V6DLySb0olH9IAjWcDODjPLHaxiz/zCDp204+FDyQRdjz0UOgFEyAO5BRfy 9IkkoVwHWX9g== X-IronPort-AV: E=McAfee;i="6000,8403,9720"; a="135171195" X-IronPort-AV: E=Sophos;i="5.76,338,1592895600"; d="scan'208";a="135171195" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2020 14:48:39 -0700 IronPort-SDR: jipGPlSIKa+ETAnKcp7ZU4u0ioIc+MJHkeCusLdX0S9JyPIYvxtFkMM45UPmFhJqh6nFZz88Ck i7OPi7FUDXFg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,338,1592895600"; d="scan'208";a="498106700" Received: from jekeller-desk.amr.corp.intel.com ([10.166.241.33]) by fmsmga006.fm.intel.com with ESMTP; 21 Aug 2020 14:48:39 -0700 From: Jacob Keller To: git@vger.kernel.org, Junio C Hamano Cc: Jacob Keller Subject: [PATCH 1/2] refspec: fix documentation referring to refspec_item Date: Fri, 21 Aug 2020 14:48:19 -0700 Message-Id: <20200821214820.757222-2-jacob.e.keller@intel.com> X-Mailer: git-send-email 2.28.0.218.ge27853923b9d.dirty In-Reply-To: <20200821214820.757222-1-jacob.e.keller@intel.com> References: <20200821214820.757222-1-jacob.e.keller@intel.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jacob Keller In commit d27eb356bf25 ("remote: move doc to remote.h and refspec.h") the documentation for the refspec structure was moved into refspec.h This documentation refers to elements of the refspec_item, not the struct refspec. Move the documentation slightly in order to align it with the structure it is actually referring to. Signed-off-by: Jacob Keller --- refspec.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/refspec.h b/refspec.h index 23e1555b88ac..8d654e3a3ac4 100644 --- a/refspec.h +++ b/refspec.h @@ -4,6 +4,19 @@ #define TAG_REFSPEC "refs/tags/*:refs/tags/*" extern const struct refspec_item *tag_refspec; +/** + * A struct refspec_item holds the parsed interpretation of a refspec. If it will + * force updates (starts with a '+'), force is true. If it is a pattern + * (sides end with '*') pattern is true. src and dest are the two sides + * (including '*' characters if present); if there is only one side, it is src, + * and dst is NULL; if sides exist but are empty (i.e., the refspec either + * starts or ends with ':'), the corresponding side is "". + * + * remote_find_tracking(), given a remote and a struct refspec_item with either src + * or dst filled out, will fill out the other such that the result is in the + * "fetch" specification for the remote (note that this evaluates patterns and + * returns a single result). + */ struct refspec_item { unsigned force : 1; unsigned pattern : 1; @@ -21,20 +34,8 @@ struct refspec_item { #define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH } /** - * A struct refspec holds the parsed interpretation of a refspec. If it will - * force updates (starts with a '+'), force is true. If it is a pattern - * (sides end with '*') pattern is true. src and dest are the two sides - * (including '*' characters if present); if there is only one side, it is src, - * and dst is NULL; if sides exist but are empty (i.e., the refspec either - * starts or ends with ':'), the corresponding side is "". - * - * An array of strings can be parsed into an array of struct refspecs using + * An array of strings can be parsed into a struct refspec using * parse_fetch_refspec() or parse_push_refspec(). - * - * remote_find_tracking(), given a remote and a struct refspec with either src - * or dst filled out, will fill out the other such that the result is in the - * "fetch" specification for the remote (note that this evaluates patterns and - * returns a single result). */ struct refspec { struct refspec_item *items; From patchwork Fri Aug 21 21:48:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 11730617 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B976B1575 for ; Fri, 21 Aug 2020 21:48:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4C42207DE for ; Fri, 21 Aug 2020 21:48:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726887AbgHUVsn (ORCPT ); Fri, 21 Aug 2020 17:48:43 -0400 Received: from mga12.intel.com ([192.55.52.136]:19358 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726187AbgHUVsl (ORCPT ); Fri, 21 Aug 2020 17:48:41 -0400 IronPort-SDR: yPHBBXXDr1Wku5PmBcR9XYa29m4eUuvjfYsdauwEK5gk191Hhb/w6SjBvLb6RZJCX1hgxt0ZZM dMlF1RYu8ZxA== X-IronPort-AV: E=McAfee;i="6000,8403,9720"; a="135171196" X-IronPort-AV: E=Sophos;i="5.76,338,1592895600"; d="scan'208";a="135171196" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2020 14:48:39 -0700 IronPort-SDR: HDaViU7urkR9ROQmDmoNc7+TsXDqBKwtDFCpqWV6ZV9f9XHc1VqfPjYsphO2vAmqz8VfHej9LR u4gFG+IWsSyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,338,1592895600"; d="scan'208";a="498106701" Received: from jekeller-desk.amr.corp.intel.com ([10.166.241.33]) by fmsmga006.fm.intel.com with ESMTP; 21 Aug 2020 14:48:39 -0700 From: Jacob Keller To: git@vger.kernel.org, Junio C Hamano Cc: Jacob Keller Subject: [PATCH 2/2] refspec: make sure stack refspec_item variables are zeroed Date: Fri, 21 Aug 2020 14:48:20 -0700 Message-Id: <20200821214820.757222-3-jacob.e.keller@intel.com> X-Mailer: git-send-email 2.28.0.218.ge27853923b9d.dirty In-Reply-To: <20200821214820.757222-1-jacob.e.keller@intel.com> References: <20200821214820.757222-1-jacob.e.keller@intel.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jacob Keller A couple of functions that used struct refspec_item did not zero out the structure memory. This can result in unexpected behavior, especially if additional parameters are ever added to refspec_item in the future. Use memset to ensure that unset structure members are zero. It may make sense to convert most of these uses of struct refspec_item to use either struct initializers or refspec_item_init_or_die. However, other similar code uses memset. Converting all of these uses has been left as a future exercise. Signed-off-by: Jacob Keller --- builtin/remote.c | 1 + transport.c | 1 + 2 files changed, 2 insertions(+) diff --git a/builtin/remote.c b/builtin/remote.c index c8240e9fcd58..542f56e3878b 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -478,6 +478,7 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map; struct refspec_item refspec; + memset(&refspec, 0, sizeof(refspec)); refspec.force = 0; refspec.pattern = 1; refspec.src = refspec.dst = "refs/heads/*"; diff --git a/transport.c b/transport.c index 2d4fd851dc0f..419be0b6ea4b 100644 --- a/transport.c +++ b/transport.c @@ -443,6 +443,7 @@ void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int v if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) return; + memset(&rs, 0, sizeof(rs)); rs.src = ref->name; rs.dst = NULL;