From ed3655c4c7f9692340f7b54054d35f24a0cc3f68 Mon Sep 17 00:00:00 2001 From: Tom N Harris Date: Fri, 16 Jan 2009 01:15:47 +0100 Subject: Avoid zero-byte reads darcs-hash:20090116001547-6942e-b5bc401c0ef4c36b1b7b8ca7ef708587953ec017.gz --- inc/JpegMeta.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index 41e6e0803..cb1d7d694 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -995,7 +995,10 @@ class JpegMeta $this->_markers[$count]['length'] = $length; if ($capture) { - $this->_markers[$count]['data'] =& fread($this->_fp, $length); + if ($length) + $this->_markers[$count]['data'] =& fread($this->_fp, $length); + else + $this->_markers[$count]['data'] = ""; } elseif (!$done) { $result = @fseek($this->_fp, $length, SEEK_CUR); @@ -1213,12 +1216,12 @@ class JpegMeta else { if ($marker == 0xDA) { // Copy until EOF while (!feof($this->_fp)) { - $data =& fread($this->_fp, 1024 * 16); + $data = fread($this->_fp, 1024 * 16); fputs($this->_fpout, $data, strlen($data)); } } else { // Copy only $length bytes - $data =& fread($this->_fp, $length); + $data = @fread($this->_fp, $length); fputs($this->_fpout, $data, $length); } } -- cgit v1.2.3