From: David Barr <david.barr@cordelta.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
David Barr <david.barr@cordelta.com>
Subject: [PATCH] fixup! vcs-svn: improve reporting of input errors
Date: Thu, 24 Mar 2011 23:43:56 +1100 [thread overview]
Message-ID: <1300970636-31743-1-git-send-email-david.barr@cordelta.com> (raw)
In-Reply-To: <7vsjuegzj8.fsf@alter.siamese.dyndns.org>
An excessive constraint was introduced in c9d1c8ba; when reading
svn props, it is permissible for both keys and values to contain
nul characters. Thus the test `strlen(val) != len` may fail on
such properties. This caused svn-fe to die early whilst handling
revision 59151 of the ASF repository.
---
vcs-svn/svndump.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index ea5b128..9bd4fb2 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -171,7 +171,7 @@ static void read_props(void)
die("invalid property line: %s\n", t);
len = atoi(&t[2]);
val = buffer_read_string(&input, len);
- if (!val || strlen(val) != len)
+ if (!val)
die_short_read();
/* Discard trailing newline. */
--
1.7.3.2.846.gf4b062
next prev parent reply other threads:[~2011-03-24 12:44 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-19 7:03 vcs-svn: purge obsolete data structures and code David Barr
2011-03-19 7:03 ` [PATCH 1/9] vcs-svn: pass paths through to fast-import David Barr
2011-03-19 7:50 ` Jonathan Nieder
2011-03-19 7:03 ` [PATCH 2/9] vcs-svn: avoid using ls command twice David Barr
2011-03-19 8:01 ` Jonathan Nieder
2011-03-19 7:03 ` [PATCH 3/9] vcs-svn: implement perfect hash for node-prop keys David Barr
2011-03-19 8:51 ` Jonathan Nieder
2011-03-21 1:26 ` [PATCH 1/3] " David Barr
2011-03-21 1:26 ` [PATCH 2/3] vcs-svn: implement perfect hash for top-level keys David Barr
2011-03-21 1:26 ` [PATCH 3/3] vcs-svn: use switch rather than cascading ifs David Barr
2011-03-21 1:38 ` [PATCHv2] " David Barr
2011-03-19 7:03 ` [PATCH 4/9] vcs-svn: implement perfect hash for top-level keys David Barr
2011-03-19 8:57 ` Jonathan Nieder
2011-03-19 7:03 ` [PATCH 5/9] vcs-svn: factor out usage of string_pool David Barr
2011-03-19 9:08 ` Jonathan Nieder
2011-03-19 7:03 ` [PATCH 6/9] vcs-svn: drop string_pool David Barr
2011-03-19 7:03 ` [PATCH 7/9] vcs-svn: drop trp.h David Barr
2011-03-19 7:03 ` [PATCH 8/9] vcs-svn: drop obj_pool.h David Barr
2011-03-19 7:03 ` [PATCH 9/9] vcs-svn: use strchr to find RFC822 delimiter David Barr
2011-03-19 9:10 ` Jonathan Nieder
2011-03-19 7:20 ` vcs-svn: integrate support for text deltas David Barr
2011-03-19 7:20 ` [PATCH 01/16] vcs-svn: improve support for reading large files David Barr
2011-03-19 7:20 ` [PATCH 02/16] vcs-svn: make buffer_skip_bytes return length read David Barr
2011-03-19 7:20 ` [PATCH 03/16] vcs-svn: make buffer_copy_bytes " David Barr
2011-03-19 7:20 ` [PATCH 04/16] vcs-svn: improve reporting of input errors David Barr
2011-03-19 7:20 ` [PATCH 05/16] vcs-svn: learn to maintain a sliding view of a file David Barr
2011-03-19 7:20 ` [PATCH 06/16] vcs-svn: skeleton of an svn delta parser David Barr
2011-03-28 3:30 ` Jonathan Nieder
2011-03-19 7:20 ` [PATCH 07/16] vcs-svn: parse svndiff0 window header David Barr
2011-03-19 7:20 ` [PATCH 08/16] vcs-svn: read the preimage when applying deltas David Barr
2011-03-19 7:20 ` [PATCH 09/16] vcs-svn: read inline data from deltas David Barr
2011-03-19 7:20 ` [PATCH 10/16] vcs-svn: read instructions " David Barr
2011-03-19 7:20 ` [PATCH 11/16] vcs-svn: implement copyfrom_data delta instruction David Barr
2011-03-19 7:20 ` [PATCH 12/16] vcs-svn: verify that deltas consume all inline data David Barr
2011-03-19 7:20 ` [PATCH 13/16] vcs-svn: let deltas use data from postimage David Barr
2011-03-19 7:20 ` [PATCH 14/16] vcs-svn: let deltas use data from preimage David Barr
2011-03-19 7:20 ` [PATCH 15/16] vcs-svn: microcleanup in svndiff0 window-reading code David Barr
2011-03-19 7:20 ` [PATCH 16/16] vcs-svn: implement text-delta handling David Barr
2011-03-28 7:00 ` vcs-svn: integrate support for text deltas Jonathan Nieder
2011-03-28 11:56 ` David Barr
2011-03-21 23:49 ` [PATCHv2 00/11] vcs-svn: purge obsolete data structures and code David Barr
2011-03-21 23:49 ` [PATCH 01/11] vcs-svn: use strbuf for revision log David Barr
2011-03-21 23:49 ` [PATCH 02/11] vcs-svn: pass paths through to fast-import David Barr
2011-03-21 23:49 ` [PATCH 03/11] vcs-svn: avoid using ls command twice David Barr
2011-03-21 23:49 ` [PATCH 04/11] vcs-svn: implement perfect hash for node-prop keys David Barr
2011-03-21 23:49 ` [PATCH 05/11] vcs-svn: implement perfect hash for top-level keys David Barr
2011-03-21 23:49 ` [PATCH 06/11] vcs-svn: use switch rather than cascading ifs David Barr
2011-03-21 23:49 ` [PATCH 07/11] vcs-svn: factor out usage of string_pool David Barr
2011-03-21 23:49 ` [PATCH 08/11] vcs-svn: drop string_pool David Barr
2011-03-21 23:49 ` =?^[?q?=5BPATCH=2009/11=5D=20vcs-svn=3A=20drop=20trp=2Eh?= David Barr
2011-03-21 23:49 ` [PATCH 10/11] vcs-svn: drop obj_pool.h David Barr
2011-03-21 23:50 ` [PATCH 11/11] vcs-svn: use strchr to find RFC822 delimiter David Barr
2011-03-23 0:32 ` [PULL svn-fe] vcs-svn: simplifications, error handling improvements Jonathan Nieder
2011-03-23 5:46 ` Junio C Hamano
2011-03-23 6:03 ` Junio C Hamano
2011-03-26 6:42 ` Jonathan Nieder
2011-03-26 9:49 ` t0081-line-buffer.sh hangs (Re: [PULL svn-fe] vcs-svn: simplifications, error handling improvements) Jonathan Nieder
2011-03-23 7:11 ` [PULL svn-fe] vcs-svn: simplifications, error handling improvements David Barr
2011-03-24 12:43 ` David Barr [this message]
2011-03-25 1:12 ` [PATCH] fixup! vcs-svn: improve reporting of input errors Jonathan Nieder
2011-03-25 3:34 ` [PATCH svn-fe 0/4] vcs-svn: null bytes in properties Jonathan Nieder
2011-03-25 4:07 ` [PATCH 1/4] vcs-svn: make reading of properties binary-safe Jonathan Nieder
2011-03-28 15:34 ` tb
2011-03-28 19:41 ` Jonathan Nieder
2011-03-28 20:30 ` Torsten Bögershausen
2011-03-28 20:44 ` Jonathan Nieder
2011-03-25 4:09 ` [PATCH 2/4] vcs-svn: remove buffer_read_string Jonathan Nieder
2011-03-25 4:10 ` [PATCH 3/4] vcs-svn: avoid unnecessary copying of log message and author Jonathan Nieder
2011-03-25 4:11 ` [PATCH 4/4] vcs-svn: handle log message with embedded null bytes Jonathan Nieder
2011-03-26 6:46 ` [PULL svn-fe] vcs-svn: simplifications, error handling improvements Jonathan Nieder
2011-03-26 18:36 ` Junio C Hamano
2011-03-28 0:38 ` [PATCH svn-fe] vcs-svn: add missing cast to printf argument Jonathan Nieder
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=1300970636-31743-1-git-send-email-david.barr@cordelta.com \
--to=david.barr@cordelta.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/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).