[PATCH] Fix in Git.pm cat_blob crashes on large files (reviewed by Jeff King)

Joshua Clayton· Feb 22, 2013, 17:03 UTC · lore

Read and write each 1024 byte buffer, rather than trying to buffer the entire content of the file. Previous code would crash on all files > 2 Gib, when the offset variable became negative (perhaps below the level of perl), resulting in a crash. On a 32 bit system, or a system with low memory it might crash before reaching 2 GiB due to memory exhaustion.

Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
---
 perl/Git.pm |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Show changes to perl/Git.pm +5 −7

diff --git a/perl/Git.pm b/perl/Git.pm
index 931047c..cc91288 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -949,13 +949,16 @@ sub cat_blob {
 		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");
+		}
 	}

 	# Skip past the trailing newline.
@@ -970,11 +973,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;
 }

-- 
1.7.10.4

Erik Faye-Lund· Feb 22, 2013, 17:10 UTC · re: Joshua Clayton · lore

Re: [PATCH] Fix in Git.pm cat_blob crashes on large files (reviewed by Jeff King)

On Fri, Feb 22, 2013 at 6:03 PM, Joshua Clayton <stillcompiling@gmail.com> wrote:

Show 8 quoted lines

> Read and write each 1024 byte buffer, rather than trying to buffer
> the entire content of the file.
> Previous code would crash on all files > 2 Gib, when the offset variable
> became negative (perhaps below the level of perl), resulting in a crash.
> On a 32 bit system, or a system with low memory it might crash before
> reaching 2 GiB due to memory exhaustion.
>
> Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>

We usually put "Reviewed-by: Name <email>" right below the SoB-line, rather than in the subject. And then we CC the people who were involved in the previous round :)

patchFix in Git.pm cat_blob crashes on large files (reviewed by Jeff King)