From: Stephan Beyer <s-beyer@gmx.net>
To: "René Scharfe" <l.s.r@web.de>, "Paul Tan" <pyokagan@gmail.com>,
"Jeff King" <peff@peff.net>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Shawn O. Pearce" <spearce@spearce.org>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: Stephan Beyer <s-beyer@gmx.net>, 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 [thread overview]
Message-ID: <20190905224833.24913-3-s-beyer@gmx.net> (raw)
In-Reply-To: <20190905224833.24913-1-s-beyer@gmx.net>
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 <s-beyer@gmx.net>
---
pack-objects.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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);
--
2.23.0.43.g31ebfd7ae6.dirty
next prev parent reply other threads:[~2019-09-05 22:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 22:48 [PATCH v2 1/4] am: fail if no author line is given in --rebasing mode Stephan Beyer
2019-09-05 22:48 ` [PATCH v2 2/4] test-read-cache: fix maybe-uninitialized warning for namelen Stephan Beyer
2019-09-05 22:48 ` Stephan Beyer [this message]
2019-09-05 22:48 ` [PATCH v2 4/4] Silence false-positive maybe-uninitialized warnings found by gcc 9 -flto Stephan Beyer
2019-09-06 12:39 ` [PATCH v2 1/4] am: fail if no author line is given in --rebasing mode Stephan Beyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190905224833.24913-3-s-beyer@gmx.net \
--to=s-beyer@gmx.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
--cc=pyokagan@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).