kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/perl-cat-blob' into maint-1.8.1 

* jc/perl-cat-blob:
  Git.pm: fix cat_blob crashes on large files
maint
Junio C Hamano 2013-04-03 08:35:45 -07:00
parent d7df695d85 712c6adaee
commit a134a60d0b
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
perl/Git.pm
View File

@ -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;
}