From: Ralf Thielow <ralf.thielow@googlemail.com>
To: git@vger.kernel.org
Cc: Ralf Thielow <ralf.thielow@googlemail.com>
Subject: [PATCH] commit: Remove backward goto in read_craft_line()
Date: Wed, 1 Dec 2010 20:15:59 +0100 [thread overview]
Message-ID: <1291230959-3894-1-git-send-email-ralf.thielow@googlemail.com> (raw)
In case of bad graft data which is determine on many
places we go back to the first place of detection,
so move it to the end of the function.
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
---
commit.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/commit.c b/commit.c
index 0094ec1..d86159a 100644
--- a/commit.c
+++ b/commit.c
@@ -137,12 +137,8 @@ struct commit_graft *read_graft_line(char *buf, int len)
buf[--len] = '\0';
if (buf[0] == '#' || buf[0] == '\0')
return NULL;
- if ((len + 1) % 41) {
- bad_graft_data:
- error("bad graft data: %s", buf);
- free(graft);
- return NULL;
- }
+ if ((len + 1) % 41)
+ goto bad_graft_data;
i = (len + 1) / 41 - 1;
graft = xmalloc(sizeof(*graft) + 20 * i);
graft->nr_parent = i;
@@ -155,6 +151,11 @@ struct commit_graft *read_graft_line(char *buf, int len)
goto bad_graft_data;
}
return graft;
+
+bad_graft_data:
+ error("bad graft data: %s", buf);
+ free(graft);
+ return NULL;
}
static int read_graft_file(const char *graft_file)
--
1.7.1
next reply other threads:[~2010-12-01 19:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-01 19:15 Ralf Thielow [this message]
2010-12-01 19:44 ` [PATCH] commit: Remove backward goto in read_craft_line() Jonathan Nieder
2010-12-01 20:19 ` Junio C Hamano
2010-12-01 20:31 ` Jonathan Nieder
2010-12-01 20:44 ` Ralf Thielow
2010-12-01 21:07 ` Trivial patches (Re: [PATCH] commit: Remove backward goto in read_craft_line()) Jonathan Nieder
2010-12-01 21:19 ` [PATCH] commit: Remove backward goto in read_craft_line() Junio C Hamano
2010-12-01 21:40 ` Ralf Thielow
-- strict thread matches above, loose matches on Subject: below --
2010-12-01 19:59 Ralf Thielow
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291230959-3894-1-git-send-email-ralf.thielow@googlemail.com \
--to=ralf.thielow@googlemail.com \
--cc=git@vger.kernel.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.
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 NNTP newsgroup(s).