summaryrefslogtreecommitdiff
path: root/inc/JpegMeta.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/JpegMeta.php')
-rw-r--r--inc/JpegMeta.php9
1 files changed, 6 insertions, 3 deletions
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);
}
}