From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/3] import: extra check for final byte read
Date: Mon, 25 Apr 2016 09:52:45 +0000 [thread overview]
Message-ID: <20160425095247.17472-2-e@80x24.org> (raw)
In-Reply-To: <20160425095247.17472-1-e@80x24.org>
The read could fail entirely and leave $lf undefined.
---
lib/PublicInbox/Import.pm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 7073c3d..8a40fb5 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -93,14 +93,16 @@ sub remove {
my $left = $1;
my $offset = 0;
my $buf = '';
+ my $n;
while ($left > 0) {
- my $n = read($r, $buf, $left, $offset);
+ $n = read($r, $buf, $left, $offset);
defined($n) or die "read cat-blob failed: $!";
$n == 0 and die 'fast-export (cat-blob) died';
$left -= $n;
$offset += $n;
}
- read($r, my $lf, 1);
+ $n = read($r, my $lf, 1);
+ defined($n) or die "read final byte of cat-blob failed: $!";
die "bad read on final byte: <$lf>" if $lf ne "\n";
my $cur = Email::MIME->new($buf);
if ($cur->header('Subject') ne $mime->header('Subject') ||
--
EW
next prev parent reply other threads:[~2016-04-25 9:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-25 9:52 [PATCH 0/3] remove ssoma dependency from public-inbox Eric Wong
2016-04-25 9:52 ` Eric Wong [this message]
2016-04-25 9:52 ` [PATCH 2/3] remove ssoma dependency Eric Wong
2016-04-25 12:02 ` [PATCH 4/3] t/feed.t: run properly without ssoma installed Eric Wong
2016-04-25 9:52 ` [PATCH 3/3] remove GIT_DIR env usage in favor of --git-dir Eric Wong
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: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160425095247.17472-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.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 read-only IMAP folder(s) and NNTP newsgroup(s).