From patchwork Thu Sep 5 22:48:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Beyer X-Patchwork-Id: 11134109 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 075251593 for ; Thu, 5 Sep 2019 22:49:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23E7A20825 for ; Thu, 5 Sep 2019 22:49:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="Qor1So1y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732446AbfIEWtG (ORCPT ); Thu, 5 Sep 2019 18:49:06 -0400 Received: from mout.gmx.net ([212.227.17.20]:33623 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730236AbfIEWtG (ORCPT ); Thu, 5 Sep 2019 18:49:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1567723733; bh=SeMLqO86JoYG6v14vtoeMLSS93ntr0h4oFy0tBB+37g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=Qor1So1yERtvv3DStluZeuQJaZoOifr4PRriQSmiVue17F05mbFK/oL5bqsji6VqG de5o6w17wuMDpeKhCaBn/UvKIRvhsYzdNSLBXbZM/8uNDxjItRJB0e/e1Bk0jAPCnL JdRVM+vA+zLKS4oUDj90SgDXCli9Ch44QMilPgxY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([88.70.128.63]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MvbG2-1iPC4J2rri-00saOP; Fri, 06 Sep 2019 00:48:53 +0200 From: Stephan Beyer To: =?utf-8?q?Ren=C3=A9_Scharfe?= , Paul Tan , Jeff King , "brian m. carlson" , "Shawn O. Pearce" , Johannes Schindelin Cc: Stephan Beyer , git@vger.kernel.org Subject: [PATCH v2 1/4] am: fail if no author line is given in --rebasing mode Date: Fri, 6 Sep 2019 00:48:30 +0200 Message-Id: <20190905224833.24913-1-s-beyer@gmx.net> X-Mailer: git-send-email 2.23.0.43.g31ebfd7ae6.dirty MIME-Version: 1.0 X-Provags-ID: V03:K1:BAZEHeAiGgGYpYbZwaeeFHP3E6Zah5UgiTRBi2qMQyrbVJgI5gd wCk+Czm9bU4e45sownegwnQrzlkQ1HKKA0Jd6EMGqoM7Ke+eRxr9bieywqq5wMxJ56xKBlM KHcgZlj8yC0V06uv1Ya/T5n0vDAxs4kAKS5MZ3atMkPXPTfvIMuGpD0MRSqjpHwYZtiFF1M KfDbZ1j1llTMV6CTsCRbw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:2nAg6GmvtNc=:6nK9jzCIAQE4HJfL7ZIyRP Cv9/T7JX6Q/wg8nv5ijKXg9lD4PfibFJAtIKxQMbJUSgXQrnCvsVqeBlrVPmziWNYHN/pjCNi GUug8cCdcrshty7AT3IJmTeW9DtGE5zFJhrhOEkewsDOQEDtLcG9dF8EKTzi6YQHeWRWX4X3F h2mJPKn2xFy3HgB4EkiiBNwM+hOpv9I5tn9lSumw/WPJo95Yft8krsI52hR8HIKRPHpMKrkvA 5BxviEx07GsHAhHKqwUDVFh9n0NqBtwdRwI8cZfjbQS/dIGYohSwc6vMbXKhvTMMARWfHCosz QVsRWkQKp8ozHd+LKmijSEqgAvSCIBlIeDK1HE0Lz8+N4LR0GC03ciJRyv6UOnh6IsRLLrXZT +YW2dO2M+4ZEk78js5OQh3L213BTc9H0J2g5n2YWt6rv5N8q+julZscD9xGb3WxXh5KtoaXDT m1PQe1sBQdmN3+Pkd9UAFbB6fAimvce0h7IJ4uPlo5CTJSF7qQq+AVfON7qVAT4ypoPDlx5AJ xUoeW6cXtKQE/nkULmeD08MmhL1RGBoDr7diigZ+jUKAreh+Du1q32816TwsL4c2pwwfkOQtP xHo4tZ5q47RtMT3nfYO+pAjsuYgKe7zxVZjAzxX0axWxcrMJ/PKpvczy6bZ0Hkl7zA2TxPQ+n refp8p0QVw57gdAoOTIyD9ucqlIgXtbn7/oZFGUH2/UfSwWnIIpkUbBOZxeE7quKMh2GISJGB 6b82clHIObo+RMoL8ja7of/GrJCG1EaNoJqC6E7oZzEDOicZnKZ7K2nCjFVQXcreruZYmsZRw 4lP+9czEouA+TNrbxd0SNKAeOTbisTkRusewmy1X25t8Mhvo/PRFc51psSVrNlOdUMYlGTBhP OM/uyS4dV0YzeIrjWENUuwt5hjhL9i3xbV3qlBmWofOSaWlBbEjaPN/ANfjvlOJMAVhjwTREd 6/MV+BdNPLEqTGVVYbIyWjWdW+cEhXl0/9jlc6vF09tBBDUkwoB8f1HWI3YqmxMAJH0MGpRdp PWkLQ3x4U1QbPeGBVyO2qpPkujTubzDhjFC3dTH9JYp8csw4mkOIi3vkUhOclwMbikK9ExHtk KMGmT2ZFSn9stnh875w+DEfJ5g/B97SY+F+x3I/oulWhfbp+hMIoPHjmRlt6+Vm2UPMuxUpXD /L+wFYD6QTWQHGxss7PcuFT3aum+iFzf2qTJifAFWKRDrohHS3Q0eVbxmjGEjxpnWzSn8= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This prevents a potential segmentation fault. Signed-off-by: Stephan Beyer --- builtin/am.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.23.0.43.g31ebfd7ae6.dirty diff --git a/builtin/am.c b/builtin/am.c index 1aea657a7f..71da34913c 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1272,7 +1272,8 @@ static void get_commit_info(struct am_state *state, struct commit *commit) buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding()); ident_line = find_commit_header(buffer, "author", &ident_len); - + if (!ident_line) + die(_("no author line")); if (split_ident_line(&id, ident_line, ident_len) < 0) die(_("invalid ident line: %.*s"), (int)ident_len, ident_line); From patchwork Thu Sep 5 22:48:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Beyer X-Patchwork-Id: 11134113 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 DDC981398 for ; Thu, 5 Sep 2019 22:49:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A91120825 for ; Thu, 5 Sep 2019 22:49:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="H2E346KX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388938AbfIEWtK (ORCPT ); Thu, 5 Sep 2019 18:49:10 -0400 Received: from mout.gmx.net ([212.227.17.22]:32857 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388014AbfIEWtK (ORCPT ); Thu, 5 Sep 2019 18:49:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1567723736; bh=UYI0iOs94YWxw+je0eT4angiO4VJNZ9HC79OATPTagU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=H2E346KXj41Yg12T8MdM5e2yg4NHO328Uv5UxJDz8qx7tRjBMfE/1EDLSv+b3EeTN ne061BdOxUxMbEVutowb352dgBPszQ2mYzfKU1FVABUaq0IxiSMVn2iBb1PQTOS08/ VpRD+gCzc4FZPrC8PioSyl/yRSwbed0/SNIfIPdo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([88.70.128.63]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MowKc-1iVkbG2674-00qVzF; Fri, 06 Sep 2019 00:48:56 +0200 From: Stephan Beyer To: =?utf-8?q?Ren=C3=A9_Scharfe?= , Paul Tan , Jeff King , "brian m. carlson" , "Shawn O. Pearce" , Johannes Schindelin Cc: Stephan Beyer , git@vger.kernel.org Subject: [PATCH v2 2/4] test-read-cache: fix maybe-uninitialized warning for namelen Date: Fri, 6 Sep 2019 00:48:31 +0200 Message-Id: <20190905224833.24913-2-s-beyer@gmx.net> X-Mailer: git-send-email 2.23.0.43.g31ebfd7ae6.dirty In-Reply-To: <20190905224833.24913-1-s-beyer@gmx.net> References: <20190905224833.24913-1-s-beyer@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:C3tvh2epfMGWr5aBeX0vSlSKNIXKxddiDBfHG+JLUXRa/C2p1Yf HcTrvkTEwkjLToQyTYzbuqKwLoTZlrmmZWsOwjeWGnyvMMkIiWGGiQkUpW7WMPpmYijE/nT ijQhxi/exjALYgR3MhCqL6XOfG7Ve+UrXTZsyiC4MNLB4ihxUdEco5ckm4Fd2Wle7CwjY7+ AZdxgoLG5fENVaWDsg2tQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:rxBlS7Ik2+U=:k2geS4Nxsohh+ln4i3zFuH bYEzgK9yYD3lA7yoARjD6yTe3EXUxjQCledGXojH8PfhkT6l/rqBWJk4ae9P7Xli5ArNsVLF9 0FA3WNdCyoqcovHk3FhqhMlSmPrOMuydoIqjvsXxY0Ufz4x738jGBOxCctS7QdWwiWsDP6xg3 ERHlaK/gK6ZSfjYA+wneTgqbQ+8SchDenw2DlVissrxT68ETBpKls/I2MM8hforU91AUiaFXp 7QpcwyEBQudXg4wuWgB5QZGwiRFx97k6yLaX8ImAJuZ+YzJMk2BoOBtSIvtB2V07KuO+AbVBc 5Sae9Vcn2ATLiIYMpAXc6feV1zhDsq3mxuYD3chim49QqCsDa0Xmxh+zAjmGI2hqRGrnyCtYD 4Ls6mmtF4OWxN7ndC+2Wr7ME/RRmBwORS+zliyMQSAA1MGqkZtN5HRGrXa+ZVLxu8+VlvLxmm BGHg3v7SywVveb1wJ0jQqwSMzLUL6ALEKli66WfwmYYIuC4R99SSpZScqLGhdJoH6lcDm4dOq HfFwgVuX+4+XgP4gcKK+zOxVNwjUqUociQvOHc1e16TLd75126or2zvhlki3dy4cGGaJpfwAN gcyzYkEVu+0Ju7UyEl/jUJ7uBjzM37BqK4Oj8c51o3vys1Ww3YjS49+nyCuXgXZL8191x+SNb 5nThgrtLLb6zGhDcf52isw9f61W71NHiCBy95k1lFi9QbfEmBoLHQGI8S+4RP5DE/+obtZSvA P3mwWJq4UpECI4arn46E2lk4uZrJYhkMmLn3W5b9vtD0Rydx/5OySqv2XG476ohh/DGcZaXA0 uncA9ESBtqokopc7nSbHMhfvI3RtonBnHKX/8x4Gpn490bzpXkcvSHIcLwhIQHbq0Xz+rGpJH 8RikK8L9Crx16A0kDVGpZNUGnVSYh/BAtik+wDmcNTU7eo676XjtqUu06sk0qkKMh9X/dU+yA DqsnvCT9MX/Si5yypbueXjP2JrIh1kMJT5o+erMm53x8JHicvFz5Wr7GG8Y9AG1GZzhvtHah3 +icDs69AevEfD0spp8YlUDBhn0fOLZBCv+133RUz6Eb5KyF4kXogfztuVAH5OBHAZ4/IGQaLl //44VYMEwAGiMH+gnBh8L4esl0rsfofCw+1a8RrtxQBO3EhNCwRZGscgkz8YguODGDHxzbc2c uaOVK4ngYD16FoCeb43R3OxCSRnR6OMNnpXh8plxWy/poxJcPiNissPSyrEjPy4f4iyzk= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is done by removing namelen at all. It is only used once and simply strlen(name), hence we use strlen(name) directly. Suggested-by: Jeff King Signed-off-by: Stephan Beyer --- t/helper/test-read-cache.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.23.0.43.g31ebfd7ae6.dirty diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c index 7e79b555de..244977a29b 100644 --- a/t/helper/test-read-cache.c +++ b/t/helper/test-read-cache.c @@ -4,11 +4,10 @@ int cmd__read_cache(int argc, const char **argv) { - int i, cnt = 1, namelen; + int i, cnt = 1; const char *name = NULL; if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) { - namelen = strlen(name); argc--; argv++; } @@ -24,7 +23,7 @@ int cmd__read_cache(int argc, const char **argv) refresh_index(&the_index, REFRESH_QUIET, NULL, NULL, NULL); - pos = index_name_pos(&the_index, name, namelen); + pos = index_name_pos(&the_index, name, strlen(name)); if (pos < 0) die("%s not in index", name); printf("%s is%s up to date\n", name, From patchwork Thu Sep 5 22:48:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Beyer X-Patchwork-Id: 11134111 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 3B2AD1593 for ; Thu, 5 Sep 2019 22:49:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59F72206DF for ; Thu, 5 Sep 2019 22:49:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="L1Vq3rtf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388876AbfIEWtJ (ORCPT ); Thu, 5 Sep 2019 18:49:09 -0400 Received: from mout.gmx.net ([212.227.17.22]:57959 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730236AbfIEWtJ (ORCPT ); Thu, 5 Sep 2019 18:49:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1567723738; bh=kZ4PIVq8I4HWgF5VcmvcZuxLH14THGtMwl2ooK4dPYY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=L1Vq3rtfUnKhe1p11wdvb0GkJT5+gh821FMSYCY0TnQ7/yFhMkF4HhDRzj8DBM/OV sHTZweljftpEHwVfHaRXpJjpY9vmXBBB+aN6kWiwBrUmtanaA//hfDtcvmucmQpZKJ Kd5PBa9eCP1AY7l4G5piFsQHMbyjoTVr2sP0P7H4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([88.70.128.63]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MyKHc-1iMQuU08mS-00yew7; Fri, 06 Sep 2019 00:48:58 +0200 From: Stephan Beyer To: =?utf-8?q?Ren=C3=A9_Scharfe?= , Paul Tan , Jeff King , "brian m. carlson" , "Shawn O. Pearce" , Johannes Schindelin Cc: Stephan Beyer , git@vger.kernel.org Subject: [PATCH v2 3/4] pack-objects: fix maybe-uninitialized warning for index_pos Date: Fri, 6 Sep 2019 00:48:32 +0200 Message-Id: <20190905224833.24913-3-s-beyer@gmx.net> X-Mailer: git-send-email 2.23.0.43.g31ebfd7ae6.dirty In-Reply-To: <20190905224833.24913-1-s-beyer@gmx.net> References: <20190905224833.24913-1-s-beyer@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:0Q03FKfpMFrbAPeACOKYgdFRjnuzvKhotT5noYxILPqVEz8LCXV 7sQOeZuLlD90ZS4THjs8Y89VRHJGfVyzn7aV2FlZmo3wIUYB9pRSY38gkgKCvLR35zuHTxW yxQ5c/D/YXfPyDDKY0RXCjpKNkvK83wWbxitWU4J5cABKUgR8LpM/VMAV5+eS5Iwlj4defH ZBXxsLrFkifS1BUtFauVQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:EQbrF2MI1+k=:34KHzZ1nS/inUVNI+tM9fL BZuKAoK73nHT32ya8kvIFmsYkCzsILSzgym7FIGjy/6GQHgESKeZz0poEf6P035D3do1rfzuq D6+D0PwgrB/COuV1PuWyn+FKU/OTWZ3O1sFC04WMmwMM3qFjBaP2rdePP4qWLtrsdIZa/CNDe WqBLPoTmK1kbO22A4lOhE+n2OjOJ3882x0qz/Gn5G8BjrwepmBiPuNp0PZVbzwzk6rGcrpqTS WN3t3+WZUuIGtTb4jv+xZkzfMzag+Kr+viuapXwN9QgNw1VDxl2+/7zQi2noAzm0rnPtr5dTF ErunfRr4xMvoVIkxTr/94wCHNVKym3C9DPHRrsyq/0WB7kHQ23iIUuA3h32UBXuqUENNyiKZZ XgyMSFD9RZMCCOwOjE0jMQCCYVgleARFfrpQW6nE4dA4eu7sVn+B9MPm76m9je9z34dnD8iby 0Pnz/BV93o+LGzzE6y1i6fG2Sp1Lg8X8iFoxd+1zlUXFoQgj2pBJGZL36enCBwVuSgiwM1/Nb 06Rw0Hx2vB8TL3EsrZW+y+8bNRSTtbqLzCkz21IgaEiCMajNCDeBn8n/i84toamArrQzksObi zs0glEeryEb5zWZfv32wUEMyDrTkILHrLnxEU21YfnVSE0HdKbYSLrf8x2INE9Qd957LFZzRr VXX/hqfLfITfY4ZP7S9AF3mO6qwrJf8dQ719VsCUofQnAcoT+oTobiSIYyZ0AWwGvp8/X95Za JK/r/+IBqioAxoehO8XR1cQQMEao52FQOek/vqDYi+i+qrpYhF8unpvp8VXu6MecTMddxr5sw FF95pbTf9JD5OQ7Rg2YNy49Vy7xY+u3nSpIyPW//uHv6X2E0B/BX8Z2T9waYBbDcFSxrw7QPN 9sMi4p0hDbq4pLskJXvAevQwd2o3dkCV0g4/2kfGJf31p9kjyITNBOP1Bbjy85oY56fro5jJ2 Cc6oi7BWwrnee9L9sm67jTd8odDbfxDzhnHPMuh2AVxdwiDZl4KrfetJ20LOBMKI990AgKrhF bWSFdQ0G2GTO7VyCZv2xQ078uFc3XSaYPdiAxmK3l+E5GOgKznr1LuGqUXrY/Ov9ZJ1Kc/cTo CEZ7nMrw5o842UGKu1y4Yfn3yG8EoJDYP6vZTY/NJ+Jp80chEpCa/OamIFsPHhALJL1Mqequt XO1vzVyIeRVIiJiN+LISukG3uCyKbCAOVF+mUm4vgOzwG+EA9TDAV4Uk569e1Fa8wS8l8= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org gcc 9.2.1 with -flto shows a maybe-uninitialized warning for index_pos in builtin/pack-objects.c's add_object_entry(). Tracking it down, the variable should be initialized in pack_objects.c's packlist_find(). The return value of locate_object_entry_hash(), which becomes index_pos, is either (in case of found = 1) the position where the (already included) OID is, or (in case of found = 0), index_pos is the position where the (not yet included) OID will be after insertion (which takes place in packlist_alloc() if the hash table is still large enough). However, packlist_find() does not invoke locate_object_entry_hash() if the index size is zero (which might be the case on the first run). This is the only case where index_pos is undefined; and it is irrelevant since the first run will increase the size of the hash table to 1024 and then the undefined value index_pos is ignored. This patch sets index_pos to zero on the first run to silence the warning. Signed-off-by: Stephan Beyer --- pack-objects.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.23.0.43.g31ebfd7ae6.dirty diff --git a/pack-objects.c b/pack-objects.c index 52560293b6..726147a75d 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -74,8 +74,11 @@ struct object_entry *packlist_find(struct packing_data *pdata, uint32_t i; int found; - if (!pdata->index_size) + if (!pdata->index_size) { + if (index_pos) + *index_pos = 0; /* silence uninitialized warning */ return NULL; + } i = locate_object_entry_hash(pdata, oid, &found); From patchwork Thu Sep 5 22:48:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephan Beyer X-Patchwork-Id: 11134115 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 00A231593 for ; Thu, 5 Sep 2019 22:49:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 218BC206DF for ; Thu, 5 Sep 2019 22:49:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="JHD7+AE1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389230AbfIEWtL (ORCPT ); Thu, 5 Sep 2019 18:49:11 -0400 Received: from mout.gmx.net ([212.227.17.22]:41493 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733259AbfIEWtK (ORCPT ); Thu, 5 Sep 2019 18:49:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1567723739; bh=QNlyjnAhXTvdbsnSEyeqz9K7nHQayEVHYE2mXD0rOMQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JHD7+AE1iFm6fcHynBXfEMpRltr+MkXv8X6rXRuMF3PS1intvEUC+uqjzJHXsj373 51vDYtFTifVm11dpX7SSq4dHM9s6DIF0dNKj6gJvb4ldNK+vBMf8tHoxAR44xEqc+V R/L1Hn6cfxs6hjmC7B3nHHsV8kNHo5nRk/wiEULI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([88.70.128.63]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MV67y-1hhMwX25UU-00S5HN; Fri, 06 Sep 2019 00:48:59 +0200 From: Stephan Beyer To: =?utf-8?q?Ren=C3=A9_Scharfe?= , Paul Tan , Jeff King , "brian m. carlson" , "Shawn O. Pearce" , Johannes Schindelin Cc: Stephan Beyer , git@vger.kernel.org Subject: [PATCH v2 4/4] Silence false-positive maybe-uninitialized warnings found by gcc 9 -flto Date: Fri, 6 Sep 2019 00:48:33 +0200 Message-Id: <20190905224833.24913-4-s-beyer@gmx.net> X-Mailer: git-send-email 2.23.0.43.g31ebfd7ae6.dirty In-Reply-To: <20190905224833.24913-1-s-beyer@gmx.net> References: <20190905224833.24913-1-s-beyer@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:DG4+s+65E+ciFPjhqAHsYTroDv9hecMRwfPuF65a5s6fKhJQAxn NoetD5UWpRf1qjIk/S9tX8HyrBHt+00VinTYqbLhjrGHX2kPM7OuzW644LHFvZmG/DF/RH3 JMBmUtdt6+vieGkx+tmdsAWxHGsm82VOn9kkjWDoPgBMfVfVpeTrPcPoiZ5yRZy37P9QnZT uvXQvgxWOYIClg8Mlll/w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:23EomXmCFOo=:t2jWowwKDi88PVNokCoXWe +ntfAeoM6/yG3jkjngrlCSsA7ctFIxlExH0TThoDJm/oRCZTrJ/CyKAYDBWgsM410tGHbas7Z 4nSRAW2/salCiXFM8ChUyH4MavE605W0MecR56TRpz4MoBGKkhmlPJErfovNyWaeuPigYIvM2 4EIcM/Ar7CA0Da8t7QpayaRE6kDcWNYmDaFP/kXS9bm0+aFMyKat/iMX1GeVn7Ovr6DrBcxA6 qjdvy16kBu2GacrqrZUDMxW8F0N8RnQIdFfC8i+01S7pSHZ87Hus+RQNqgE1tz2yhCrdD9jp0 CH+sZWiUglJKc7nTWs0mvBb2I58LQk6GpX3oWRKzOJs14UpfK7rBNLTU6cyqrK6uvlWUkQ3zO 08E7If98GELAw9RG+UK2wuG6DiYi5LxNqKU2MnCDBkp6ca0U/PJTF8kFOvt7H1LLOFCUD/N1W 1fYmje6U6MS60D3hxOHOOONn+V9+7LXILaNcppqOwn8kLARN2pojqqocqN5nrYVMNUoKmfX1e qM2kemUvMyppm4TQf8D+236ct1siVN7urnuo2qjQ/fDn2LG1NUxoJJ4DgPItIvxz8/sir6q9H BG4Jb4az7OT+9eHt1jclGnSeG7EmYlaUxoAoMbAjvktb5TcidK7P65wphAmGi4GOAv1gXMG9a AWlVKTp+PTo5kc8Nrugc9E79vMmnwhgZiBIOLQZajyBVRrGPpzHkF0XXb3+qhPH7qfGYPCVlZ jP62B9a0RDLj1hP/n7oTcvGDxN/dbkWaGv/nQapqQLr3sZFRKN6tI/SrmPLwnMiAiuDMXtIur negdOJAwPOUrmmvyXlROJXpUJIZ5UampiEMioMQvCQ4J1hz94QEUaNVSgT8RmN8gSnMeQDZ/f k4nhBD3nBFMzTwETz8mn/HsVMgeEezAitmYbzgyxtjB+XQlWCnj/iQYDR6LD49BiBj2+P2497 U6x5m86f3MNGgmeCOpZtr49tROdKFDUMP5nPntqUfQeXb6JDqmOyZMLg6a7FoxAQAsUV58qbG moLYex+Kk8TaGNhYxtjLz6vVMWrP3otlA2yGI7GaLAU0InTi1LNG3dMCOk/vgLzmGTwbpZ+OX 4yIV8FUKzAVlSvxTXRocAawW/Hnow86eOqizFSybCwehWnkXL3V04L/dJYnOHVWX9EvUfY15F R7VTsY18C8cA5wJxWqc4zISrcudICSV2iBuKWIwvBiEawjlgY4d/rKTV+s9NgKIRGdbkC4tDv 6sDNOExnz5t+bmDNz Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org gcc 9.2.1 with -flto flag suspects some uninitialized variables which become initialized in every code path where they are used. These false positives are "fixed" by this patch in the most naïve way. This allows to compile git with gcc 9, link-time optimization, and using the DEVELOPER=1 switch (which sets -Werror). Signed-off-by: Stephan Beyer --- bulk-checkin.c | 2 ++ fast-import.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.23.0.43.g31ebfd7ae6.dirty diff --git a/bulk-checkin.c b/bulk-checkin.c index 39ee7d6107..87fa28c227 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -200,6 +200,8 @@ static int deflate_to_pack(struct bulk_checkin_state *state, struct hashfile_checkpoint checkpoint; struct pack_idx_entry *idx = NULL; + checkpoint.offset = 0; + seekback = lseek(fd, 0, SEEK_CUR); if (seekback == (off_t) -1) return error("cannot find the current offset"); diff --git a/fast-import.c b/fast-import.c index b44d6a467e..58f73f9105 100644 --- a/fast-import.c +++ b/fast-import.c @@ -903,7 +903,8 @@ static int store_object( struct object_entry *e; unsigned char hdr[96]; struct object_id oid; - unsigned long hdrlen, deltalen; + unsigned long hdrlen; + unsigned long deltalen = 0; git_hash_ctx c; git_zstream s;