Changeset 41196 for trunk/src/wp-includes/ID3/module.audio.ogg.php

Timestamp:

07/31/2017 07:49:31 PM (7 years ago)

Author:

wonderboymusic

Message:

Media: update the getID3 library to version 1.9.14 to avoid fatal errors in PHP7.

Props MyThemeShop for the initial patch.
Fixes #41496.

File:

• trunk/src/wp-includes/ID3/module.audio.ogg.php (modified) (20 diffs)

trunk/src/wp-includes/ID3/module.audio.ogg.php

@@ -27 +27 @@
         // Warn about illegal tags - only vorbiscomments are allowed
         if (isset($info['id3v2'])) {
-            $info['warning'][] = 'Illegal ID3v2 tag present.';
+            $this->warning('Illegal ID3v2 tag present.');
         }
         if (isset($info['id3v1'])) {
-            $info['warning'][] = 'Illegal ID3v1 tag present.';
+            $this->warning('Illegal ID3v1 tag present.');
         }
         if (isset($info['ape'])) {
-            $info['warning'][] = 'Illegal APE tag present.';
+            $this->warning('Illegal APE tag present.');
         }
 
@@ -45 +45 @@
 
         if ($this->ftell() >= $this->getid3->fread_buffer_size()) {
-            $info['error'][] = 'Could not find start of Ogg page in the first '.$this->getid3->fread_buffer_size().' bytes (this might not be an Ogg-Vorbis file?)';
+            $this->error('Could not find start of Ogg page in the first '.$this->getid3->fread_buffer_size().' bytes (this might not be an Ogg-Vorbis file?)');
             unset($info['fileformat']);
             unset($info['ogg']);
@@ -180 +180 @@
                 $info['video']['pixel_aspect_ratio'] = (float) $info['ogg']['pageheader']['theora']['pixel_aspect_numerator'] / $info['ogg']['pageheader']['theora']['pixel_aspect_denominator'];
             }
-$info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of getID3 ['.$this->getid3->version().'] -- bitrate, playtime and all audio data are currently unavailable';
+$this->warning('Ogg Theora (v3) not fully supported in this version of getID3 ['.$this->getid3->version().'] -- bitrate, playtime and all audio data are currently unavailable');
 
 
@@ -241 +241 @@
 
                     $info['video']['dataformat'] = 'theora1';
-                    $info['error'][] = 'Ogg Theora (v1) not correctly handled in this version of getID3 ['.$this->getid3->version().']';
+                    $this->error('Ogg Theora (v1) not correctly handled in this version of getID3 ['.$this->getid3->version().']');
                     //break;
 
@@ -249 +249 @@
 
                 } else {
-                    $info['error'][] = 'unexpected';
+                    $this->error('unexpected');
                     //break;
                 }
@@ -257 +257 @@
             $this->fseek($oggpageinfo['page_start_offset']);
 
-            $info['error'][] = 'Ogg Skeleton not correctly handled in this version of getID3 ['.$this->getid3->version().']';
+            $this->error('Ogg Skeleton not correctly handled in this version of getID3 ['.$this->getid3->version().']');
             //return false;
 
         } else {
 
-            $info['error'][] = 'Expecting either "Speex   ", "OpusHead" or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"';
+            $this->error('Expecting either "Speex   ", "OpusHead" or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"');
             unset($info['ogg']);
             unset($info['mime_type']);
@@ -285 +285 @@
                 $flac = new getid3_flac($this->getid3);
                 if (!$flac->parseMETAdata()) {
-                    $info['error'][] = 'Failed to parse FLAC headers';
+                    $this->error('Failed to parse FLAC headers');
                     return false;
                 }
@@ -300 +300 @@
                 $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 0, 8); // hard-coded to 'OpusTags'
                 if(substr($filedata, 0, 8)  != 'OpusTags') {
-                    $info['error'][] = 'Expected "OpusTags" as header but got "'.substr($filedata, 0, 8).'"';
+                    $this->error('Expected "OpusTags" as header but got "'.substr($filedata, 0, 8).'"');
                     return false;
                 }
@@ -312 +312 @@
         if (!getid3_lib::intValueSupported($info['avdataend'])) {
 
-            $info['warning'][] = 'Unable to parse Ogg end chunk file (PHP does not support file operations beyond '.round(PHP_INT_MAX / 1073741824).'GB)';
+            $this->warning('Unable to parse Ogg end chunk file (PHP does not support file operations beyond '.round(PHP_INT_MAX / 1073741824).'GB)');
 
         } else {
@@ -324 +324 @@
                 $info['ogg']['samples']   = $info['ogg']['pageheader']['eos']['pcm_abs_position'];
                 if ($info['ogg']['samples'] == 0) {
-                    $info['error'][] = 'Corrupt Ogg file: eos.number of samples == zero';
+                    $this->error('Corrupt Ogg file: eos.number of samples == zero');
                     return false;
                 }
@@ -343 +343 @@
         if (isset($info['audio']['bitrate']) && !isset($info['playtime_seconds'])) {
             if ($info['audio']['bitrate'] == 0) {
-                $info['error'][] = 'Corrupt Ogg file: bitrate_audio == zero';
+                $this->error('Corrupt Ogg file: bitrate_audio == zero');
                 return false;
             }
@@ -396 +396 @@
         $filedataoffset += 4;
         if ($info['ogg']['samplerate'] == 0) {
-            $info['error'][] = 'Corrupt Ogg file: sample rate == zero';
+            $this->error('Corrupt Ogg file: sample rate == zero');
             return false;
         }
@@ -444 +444 @@
 
         if ($info['ogg']['pageheader']['opus']['version'] < 1 || $info['ogg']['pageheader']['opus']['version'] > 15) {
-            $info['error'][] = 'Unknown opus version number (only accepting 1-15)';
+            $this->error('Unknown opus version number (only accepting 1-15)');
             return false;
         }
@@ -452 +452 @@
 
         if ($info['ogg']['pageheader']['opus']['out_channel_count'] == 0) {
-            $info['error'][] = 'Invalid channel count in opus header (must not be zero)';
+            $this->error('Invalid channel count in opus header (must not be zero)');
             return false;
         }
@@ -563 +563 @@
             default:
                 return false;
+                break;
         }
 
@@ -581 +582 @@
             if ($i >= 10000) {
                 // https://github.com/owncloud/music/issues/212#issuecomment-43082336
-                $info['warning'][] = 'Unexpectedly large number ('.$CommentsCount.') of Ogg comments - breaking after reading '.$i.' comments';
+                $this->warning('Unexpectedly large number ('.$CommentsCount.') of Ogg comments - breaking after reading '.$i.' comments');
                 break;
             }
@@ -619 +620 @@
             while ((strlen($commentdata) - $commentdataoffset) < $ThisFileInfo_ogg_comments_raw[$i]['size']) {
                 if (($ThisFileInfo_ogg_comments_raw[$i]['size'] > $info['avdataend']) || ($ThisFileInfo_ogg_comments_raw[$i]['size'] < 0)) {
-                    $info['warning'][] = 'Invalid Ogg comment size (comment #'.$i.', claims to be '.number_format($ThisFileInfo_ogg_comments_raw[$i]['size']).' bytes) - aborting reading comments';
+                    $this->warning('Invalid Ogg comment size (comment #'.$i.', claims to be '.number_format($ThisFileInfo_ogg_comments_raw[$i]['size']).' bytes) - aborting reading comments');
                     break 2;
                 }
@@ -643 +644 @@
                 //$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
                 if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
-                    $info['warning'][] = 'undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell();
+                    $this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
                     break;
                 }
                 $readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
                 if ($readlength <= 0) {
-                    $info['warning'][] = 'invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell();
+                    $this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
                     break;
                 }
@@ -662 +663 @@
 
                 // no comment?
-                $info['warning'][] = 'Blank Ogg comment ['.$i.']';
+                $this->warning('Blank Ogg comment ['.$i.']');
 
             } elseif (strstr($commentstring, '=')) {
@@ -712 +713 @@
             } else {
 
-                $info['warning'][] = '[known problem with CDex >= v1.40, < v1.50b7] Invalid Ogg comment name/value pair ['.$i.']: '.$commentstring;
+                $this->warning('[known problem with CDex >= v1.40, < v1.50b7] Invalid Ogg comment name/value pair ['.$i.']: '.$commentstring);
 
             }