JamesHeinrich#418 fread length error in XMP

JamesHeinrich#418
wikimedia · Aug 8, 2023 · cba30f6 · cba30f6
1 parent 9993caa
commit cba30f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/getid3/getid3.php b/getid3/getid3.php
@@ -387,7 +387,7 @@ class getID3
  */
  protected $startup_warning = '';
 
- const VERSION = '1.9.22-202305291732';
+ const VERSION = '1.9.22-202308081917';
  const FREAD_BUFFER_SIZE = 32768;
 
  const ATTACHMENTS_NONE = false;

diff --git a/getid3/module.tag.xmp.php b/getid3/module.tag.xmp.php
@@ -146,7 +146,16 @@ public function _get_jpeg_header_data($filename)
  $segdatastart = ftell($filehnd);
 
  // Read the segment data with length indicated by the previously read size
- $segdata = fread($filehnd, $decodedsize['size'] - 2);
+ // fread will complain about trying to read zero bytes: "fread(): Argument #2 ($length) must be greater than 0" -- https://github.com/JamesHeinrich/getID3/issues/418
+ if ($decodedsize['size'] > 2) {
+ $segdata = fread($filehnd, $decodedsize['size'] - 2);
+ } elseif ($decodedsize['size'] == 2) {
+ $segdata = '';
+ } else {
+ // invalid length
+ fclose($filehnd);
+ return false;
+ }
 
  // Store the segment information in the output array
  $headerdata[] = array(