Skip to content

Commit a56ab68

Browse files
JamesHeinrichJamesHeinrich
committed
ID3v2 errors with ord()
#476
1 parent 1e964b1 commit a56ab68

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎getid3/getid3.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ class getID3
387387
*/
388388
protected $startup_warning = '';
389389

390-
const VERSION = '1.9.24-202510231324';
390+
const VERSION = '1.9.24-202511301120';
391391
const FREAD_BUFFER_SIZE = 32768;
392392

393393
const ATTACHMENTS_NONE = false;

‎getid3/module.tag.id3v2.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
679679
$frame_textencoding_terminator = "\x00";
680680
}
681681
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
682-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
682+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
683683
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
684684
}
685685
$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -771,7 +771,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
771771
$frame_textencoding_terminator = "\x00";
772772
}
773773
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
774-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
774+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
775775
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
776776
}
777777
$parsedFrame['encodingid'] = $frame_textencoding;
@@ -998,7 +998,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
998998
$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
999999
$frame_offset += 3;
10001000
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
1001-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
1001+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
10021002
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
10031003
}
10041004
$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1062,7 +1062,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
10621062
if ($frame_terminatorpos === false) {
10631063
$frame_remainingdata = '';
10641064
} else {
1065-
if (ord(substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
1065+
if (substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
10661066
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
10671067
}
10681068
$parsedFrame['lyrics'][$timestampindex]['data'] = substr($frame_remainingdata, $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1108,7 +1108,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
11081108
$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
11091109
$frame_offset += 3;
11101110
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
1111-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
1111+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
11121112
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
11131113
}
11141114
$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1148,7 +1148,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
11481148

11491149
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00");
11501150
$frame_idstring = substr($parsedFrame['data'], 0, $frame_terminatorpos);
1151-
if (ord($frame_idstring) === 0) {
1151+
if ($frame_idstring === "\x00") {
11521152
$frame_idstring = '';
11531153
}
11541154
$frame_remainingdata = substr($parsedFrame['data'], $frame_terminatorpos + strlen("\x00"));
@@ -1279,7 +1279,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
12791279
$frame_interpolationmethod = ord(substr($parsedFrame['data'], $frame_offset++, 1));
12801280
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
12811281
$frame_idstring = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1282-
if (ord($frame_idstring) === 0) {
1282+
if ($frame_idstring === "\x00") {
12831283
$frame_idstring = '';
12841284
}
12851285
$parsedFrame['description'] = $frame_idstring;
@@ -1385,7 +1385,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
13851385
// MIME type instead of 3-char ID3v2.2-format image type (thanks xbhoffØpacbell*net)
13861386
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
13871387
$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1388-
if (ord($frame_mimetype) === 0) {
1388+
if ($frame_mimetype === "\x00") {
13891389
$frame_mimetype = '';
13901390
}
13911391
$frame_imagetype = strtoupper(str_replace('image/', '', strtolower($frame_mimetype)));
@@ -1400,7 +1400,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
14001400
if ($id3v2_majorversion > 2 && strlen($parsedFrame['data']) > $frame_offset) {
14011401
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
14021402
$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1403-
if (ord($frame_mimetype) === 0) {
1403+
if ($frame_mimetype === "\x00") {
14041404
$frame_mimetype = '';
14051405
}
14061406
$frame_offset = $frame_terminatorpos + strlen("\x00");
@@ -1412,7 +1412,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
14121412
$this->warning('data portion of APIC frame is missing at offset '.($parsedFrame['dataoffset'] + 8 + $frame_offset));
14131413
} else {
14141414
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
1415-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
1415+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
14161416
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
14171417
}
14181418
$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1519,23 +1519,23 @@ public function ParseID3v2Frame(&$parsedFrame) {
15191519
}
15201520
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
15211521
$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1522-
if (ord($frame_mimetype) === 0) {
1522+
if ($frame_mimetype === "\x00") {
15231523
$frame_mimetype = '';
15241524
}
15251525
$frame_offset = $frame_terminatorpos + strlen("\x00");
15261526

15271527
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
1528-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
1528+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
15291529
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
15301530
}
15311531
$frame_filename = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1532-
if (ord($frame_filename) === 0) {
1532+
if ($frame_filename === "\x00") {
15331533
$frame_filename = '';
15341534
}
15351535
$frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
15361536

15371537
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
1538-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
1538+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
15391539
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
15401540
}
15411541
$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1574,7 +1574,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
15741574
$frame_offset = 0;
15751575
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
15761576
$frame_emailaddress = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1577-
if (ord($frame_emailaddress) === 0) {
1577+
if ($frame_emailaddress === "\x00") {
15781578
$frame_emailaddress = '';
15791579
}
15801580
$frame_offset = $frame_terminatorpos + strlen("\x00");
@@ -1639,7 +1639,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
16391639
$frame_offset = 0;
16401640
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
16411641
$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1642-
if (ord($frame_ownerid) === 0) {
1642+
if ($frame_ownerid === "\x00") {
16431643
$frame_ownerid = '';
16441644
}
16451645
$frame_offset = $frame_terminatorpos + strlen("\x00");
@@ -1673,7 +1673,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
16731673

16741674
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
16751675
$frame_url = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1676-
if (ord($frame_url) === 0) {
1676+
if ($frame_url === "\x00") {
16771677
$frame_url = '';
16781678
}
16791679
$frame_offset = $frame_terminatorpos + strlen("\x00");
@@ -1803,17 +1803,17 @@ public function ParseID3v2Frame(&$parsedFrame) {
18031803
$frame_receivedasid = ord(substr($parsedFrame['data'], $frame_offset++, 1));
18041804

18051805
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
1806-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
1806+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
18071807
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
18081808
}
18091809
$frame_sellername = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1810-
if (ord($frame_sellername) === 0) {
1810+
if ($frame_sellername === "\x00") {
18111811
$frame_sellername = '';
18121812
}
18131813
$frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
18141814

18151815
$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
1816-
if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
1816+
if (substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1) === "\x00") {
18171817
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
18181818
}
18191819
$parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1851,7 +1851,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
18511851
$frame_offset = 0;
18521852
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
18531853
$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1854-
if (ord($frame_ownerid) === 0) {
1854+
if ($frame_ownerid === "\x00") {
18551855
$frame_ownerid = '';
18561856
}
18571857
$frame_offset = $frame_terminatorpos + strlen("\x00");
@@ -1874,7 +1874,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
18741874
$frame_offset = 0;
18751875
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
18761876
$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1877-
if (ord($frame_ownerid) === 0) {
1877+
if ($frame_ownerid === "\x00") {
18781878
$frame_ownerid = '';
18791879
}
18801880
$frame_offset = $frame_terminatorpos + strlen("\x00");
@@ -1894,7 +1894,7 @@ public function ParseID3v2Frame(&$parsedFrame) {
18941894
$frame_offset = 0;
18951895
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
18961896
$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
1897-
if (ord($frame_ownerid) === 0) {
1897+
if ($frame_ownerid === "\x00") {
18981898
$frame_ownerid = '';
18991899
}
19001900
$frame_offset = $frame_terminatorpos + strlen("\x00");

0 commit comments

Comments
 (0)