diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:46 -0700 |
commit | 8d747e17e0c6e85070dc15787a185669a712ee84 (patch) | |
tree | 1d102585a47194055791516bdb8ef87c84670772 /perl | |
parent | 98ed062a923ac4bd03f7ec13b327d51ebfc3a76a (diff) | |
parent | 712c6adaeece262121c185a55e83a5074e2a8ea6 (diff) | |
download | git-8d747e17e0c6e85070dc15787a185669a712ee84.tar.gz git-8d747e17e0c6e85070dc15787a185669a712ee84.tar.xz |
Merge branch 'jc/perl-cat-blob'
perl/Git.pm::cat_blob slurped everything in core only to write it
out to a file descriptor, which was not a very smart thing to do.
* jc/perl-cat-blob:
Git.pm: fix cat_blob crashes on large files
Diffstat (limited to 'perl')
-rw-r--r-- | perl/Git.pm | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/perl/Git.pm b/perl/Git.pm index a56d1e76f..57a17160f 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -965,20 +965,22 @@ sub cat_blob { my $size = $1; my $blob; - my $bytesRead = 0; + my $bytesLeft = $size; while (1) { - my $bytesLeft = $size - $bytesRead; last unless $bytesLeft; my $bytesToRead = $bytesLeft < 1024 ? $bytesLeft : 1024; - my $read = read($in, $blob, $bytesToRead, $bytesRead); + my $read = read($in, $blob, $bytesToRead); unless (defined($read)) { $self->_close_cat_blob(); throw Error::Simple("in pipe went bad"); } - - $bytesRead += $read; + unless (print $fh $blob) { + $self->_close_cat_blob(); + throw Error::Simple("couldn't write to passed in filehandle"); + } + $bytesLeft -= $read; } # Skip past the trailing newline. @@ -993,11 +995,6 @@ sub cat_blob { throw Error::Simple("didn't find newline after blob"); } - unless (print $fh $blob) { - $self->_close_cat_blob(); - throw Error::Simple("couldn't write to passed in filehandle"); - } - return $size; } |