From: Johan Herland <johan@herland.net>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH] Fix failed tag parsing when tag object has no body/message (and thus ends with a single '\n')
Date: Fri, 08 Jun 2007 02:08:14 +0200 [thread overview]
Message-ID: <200706080208.14571.johan@herland.net> (raw)
In-Reply-To: <200706080147.50207.johan@herland.net>
Thanks to Johannes Schindelin <Johannes.Schindelin@gmx.de> for
discovering this.
Also add a testcase for this condition.
Signed-off-by: Johan Herland <johan@herland.net>
---
This patch should hopefully fix your problem.
...Johan
t/t3800-mktag.sh | 15 +++++++++++++++
tag.c | 9 ++-------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index ac9008a..ac7cbbc 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -399,5 +399,20 @@ test_expect_success \
'create valid tag #4' \
'git-mktag <tag.sig >.git/refs/tags/mytag 2>message'
+############################################################
+# 24. create valid tag #4 (with empty message)
+
+cat >tag.sig <<EOF
+object $head
+type commit
+tag mytag
+keywords note
+tagger a
+EOF
+
+test_expect_success \
+ 'create valid tag #4' \
+ 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message'
+
test_done
diff --git a/tag.c b/tag.c
index e371179..875145b 100644
--- a/tag.c
+++ b/tag.c
@@ -131,10 +131,6 @@ int parse_and_verify_tag_buffer(struct tag *item, const char *data, const unsign
header_end = memchr(tagger_line, '\n', end - tagger_line);
if (!header_end++)
return error("char" PD_FMT ": could not find \"\\n\" after \"tagger\"", tagger_line - data);
- if (end - header_end < 1)
- return error("char" PD_FMT ": premature end of data", header_end - data);
- if (*header_end != '\n') /* header must end with "\n\n" */
- return error("char" PD_FMT ": could not find blank line after header section", header_end - data);
}
else {
/* Treat tagger line as optional */
@@ -148,9 +144,8 @@ int parse_and_verify_tag_buffer(struct tag *item, const char *data, const unsign
header_end = tagger_line;
}
- if (end - header_end < 1)
- return error("char" PD_FMT ": premature end of data", header_end - data);
- if (*header_end != '\n') /* header must end with "\n\n" */
+ /* header must end with "\n\n", but "\n" is acceptable if at EOF */
+ if (header_end < end - 1 && *header_end != '\n') /* not at EOF, and next char is not '\n' */
return error("char" PD_FMT ": could not find blank line after header section", header_end - data);
/*
--
1.5.2
next prev parent reply other threads:[~2007-06-08 0:08 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-07 22:50 error: char103: premature end of data Johannes Schindelin
2007-06-07 23:05 ` Johan Herland
2007-06-07 23:28 ` Johannes Schindelin
2007-06-07 23:47 ` Johan Herland
2007-06-07 23:55 ` Johannes Schindelin
2007-06-08 0:08 ` Johan Herland [this message]
2007-06-08 6:05 ` [PATCH] Fix failed tag parsing when tag object has no body/message (and thus ends with a single '\n') Junio C Hamano
2007-06-08 8:18 ` Johan Herland
2007-06-08 16:06 ` Junio C Hamano
2007-06-09 0:10 ` [PATCH 0/21] Refactor the tag object (take 2) Johan Herland
2007-06-09 0:12 ` [PATCH 01/21] Remove unnecessary code and comments on non-existing 8kB tag object restriction Johan Herland
2007-06-09 0:13 ` [PATCH 02/21] Return error messages when parsing fails Johan Herland
2007-06-09 18:01 ` Junio C Hamano
2007-06-09 18:28 ` Johan Herland
2007-06-09 19:42 ` [PATCH] Silence error messages unless 'thorough_verify' is set Johan Herland
2007-06-10 6:48 ` Johannes Schindelin
2007-06-10 8:15 ` Junio C Hamano
2007-06-10 10:08 ` Johannes Schindelin
2007-06-10 12:10 ` Johan Herland
2007-06-10 18:51 ` Johannes Schindelin
2007-06-10 19:16 ` Johan Herland
2007-06-10 11:47 ` [PATCH 0/4] Restructure the tag object Johan Herland
2007-06-10 11:49 ` [PATCH 1/4] Make tag names (i.e. the tag object's "tag" line) optional Johan Herland
2007-06-10 22:46 ` Junio C Hamano
2007-06-10 23:01 ` Johan Herland
2007-06-11 1:11 ` Junio C Hamano
2007-06-10 11:50 ` [PATCH 2/4] Introduce optional "keywords" on tag objects Johan Herland
2007-06-10 18:42 ` Johannes Schindelin
2007-06-10 19:04 ` Johan Herland
2007-06-10 21:43 ` Junio C Hamano
2007-06-10 23:16 ` Johan Herland
2007-06-11 1:01 ` Junio C Hamano
2007-06-10 11:50 ` [PATCH 3/4] Documentation/git-mktag: Document the changes in tag object structure Johan Herland
2007-06-10 11:50 ` [PATCH 4/4] git-mktag tests: Expand on mktag selftests according to the new " Johan Herland
2007-06-10 18:35 ` [PATCH 0/4] Restructure the tag object Johannes Schindelin
2007-06-09 0:13 ` [PATCH 03/21] Refactoring to make verify_tag() and parse_tag_buffer() more similar Johan Herland
2007-06-09 2:54 ` Johannes Schindelin
2007-06-09 10:49 ` Johan Herland
2007-06-09 0:14 ` [PATCH 04/21] Refactor verification of "tagger" line to be more similar to verification of "type" and "tagger" lines Johan Herland
2007-06-09 18:01 ` Junio C Hamano
2007-06-10 7:49 ` Johannes Schindelin
2007-06-09 0:14 ` [PATCH 05/21] Make parse_tag_buffer_internal() handle item == NULL Johan Herland
2007-06-09 18:01 ` Junio C Hamano
2007-06-10 0:45 ` [PATCH] Move check for already parsed tag object to parse_tag_buffer() wrapper function Johan Herland
2007-06-10 8:06 ` [PATCH 05/21] Make parse_tag_buffer_internal() handle item == NULL Johannes Schindelin
2007-06-09 0:15 ` [PATCH 06/21] Refactor tag name verification loop to use index 'i' instead of incrementing pointer 'tag_line' Johan Herland
2007-06-09 21:26 ` Alex Riesen
2007-06-09 21:34 ` Johan Herland
2007-06-10 8:14 ` Johannes Schindelin
2007-06-10 9:01 ` Johannes Schindelin
2007-06-09 0:15 ` [PATCH 07/21] Copy the remaining differences from verify_tag() to parse_tag_buffer_internal() Johan Herland
2007-06-09 21:31 ` Alex Riesen
2007-06-09 21:39 ` Johan Herland
2007-06-10 8:22 ` Johannes Schindelin
2007-06-09 0:15 ` [PATCH 08/21] Switch from verify_tag() to parse_and_verify_tag_buffer() for verifying tag objects in git-mktag Johan Herland
2007-06-09 0:16 ` [PATCH 09/21] Remove unneeded code from mktag.c Johan Herland
2007-06-09 21:39 ` Alex Riesen
2007-06-09 21:42 ` Johan Herland
2007-06-09 0:16 ` [PATCH 10/21] Free mktag's buffer before dying Johan Herland
2007-06-09 21:37 ` Alex Riesen
2007-06-09 21:46 ` Johan Herland
2007-06-09 22:00 ` Alex Riesen
2007-06-09 22:05 ` Johan Herland
2007-06-10 8:38 ` Johannes Schindelin
2007-06-09 0:17 ` [PATCH 11/21] Rewrite error messages; fix up line lengths Johan Herland
2007-06-10 8:38 ` Johannes Schindelin
2007-06-09 0:17 ` [PATCH 12/21] Use prefixcmp() instead of memcmp() for cleaner code with less magic numbers Johan Herland
2007-06-09 21:42 ` Alex Riesen
2007-06-09 21:47 ` Johan Herland
2007-06-10 8:41 ` Johannes Schindelin
2007-06-09 0:18 ` [PATCH 13/21] Collect skipping of header field names and calculation of line lengths in one place Johan Herland
2007-06-10 8:45 ` Johannes Schindelin
2007-06-09 0:18 ` [PATCH 14/21] Add proper parsing of "tagger" line, but only when thorough_verify is set Johan Herland
2007-06-10 8:52 ` Johannes Schindelin
2007-06-10 8:58 ` Johannes Schindelin
2007-06-09 0:19 ` [PATCH 15/21] Make tag names (i.e. the tag object's "tag" line) optional Johan Herland
2007-06-10 9:07 ` Johannes Schindelin
2007-06-09 0:19 ` [PATCH 16/21] Introduce optional "keywords" on tag objects Johan Herland
2007-06-09 21:52 ` Alex Riesen
2007-06-09 22:00 ` Johan Herland
2007-06-09 22:36 ` [PATCH] Use xstrndup() instead of xmalloc() and memcpy(); fix buglet with generating default item->keywords Johan Herland
2007-06-10 0:05 ` [PATCH 16/21] Introduce optional "keywords" on tag objects Junio C Hamano
2007-06-10 0:35 ` [PATCH] Fail if tag name and keywords is not within "printable ASCII" Johan Herland
2007-06-10 1:33 ` Junio C Hamano
2007-06-09 0:20 ` [PATCH 17/21] Update comments on tag objects in mktag.c Johan Herland
2007-06-09 0:20 ` [PATCH 18/21] git-fsck: Do thorough verification of tag objects Johan Herland
2007-06-09 0:20 ` [PATCH 19/21] Documentation/git-mktag: Document the changes in tag object structure Johan Herland
2007-06-09 0:21 ` [PATCH 20/21] git-mktag tests: Expand on mktag selftests according to the new " Johan Herland
2007-06-09 0:21 ` [PATCH 21/21] Add fsck_verify_ref_to_tag_object() to verify that refname matches name stored in tag object Johan Herland
2007-06-07 23:11 ` error: char103: premature end of data Johannes Schindelin
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=200706080208.14571.johan@herland.net \
--to=johan@herland.net \
--cc=Johannes.Schindelin@gmx.de \
--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).