rik/plibreader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a defect in unicode handling

Browse Source 
git-svn-id: http://php-reader.googlecode.com/svn/trunk@145 51a70ab9-7547-0410-9469-37e369ee0574
This commit is contained in:
svollbehr
2009-03-25 22:18:50 +00:00
parent 618d083fad
commit 1ffa1965f4
23 changed files with 226 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ID3/Frame/GEOB.php
View File

@@ -95,16 +95,18 @@ final class ID3_Frame_GEOB extends ID3_Frame
case self::UTF16:
list ($this->_filename, $this->_description, $this->_objectData) =
$this->_explodeString16($this->_data, 3);
$this->_filename = $this->_convertString($this->_filename, "utf-16");
$this->_filename = $this->_convertString
(Transform::fromString16($this->_filename), "utf-16");
$this->_description = $this->_convertString
($this->_description, "utf-16");
(Transform::fromString16($this->_description), "utf-16");
break;
case self::UTF16BE:
list ($this->_filename, $this->_description, $this->_objectData) =
$this->_explodeString16($this->_data, 3);
$this->_filename = $this->_convertString($this->_filename, "utf-16be");
$this->_filename = $this->_convertString
(Transform::fromString16($this->_filename), "utf-16be");
$this->_description = $this->_convertString
($this->_description, "utf-16be");
(Transform::fromString16($this->_description), "utf-16be");
break;
case self::UTF8:
list ($this->_filename, $this->_description, $this->_objectData) =
@@ -233,12 +235,15 @@ final class ID3_Frame_GEOB extends ID3_Frame
$data = Transform::toUInt8($this->_encoding) . $this->_mimeType . "\0";
switch ($this->_encoding) {
case self::UTF16LE:
$data .= 0xfeff . $this->_filename . "\0\0" . 0xfeff .
$this->_description . "\0\0";
$data .= Transform::toString16
($this->_filename, Transform::LITTLE_ENDIAN_ORDER, 1) .
Transform::toString16
($this->_description, Transform::LITTLE_ENDIAN_ORDER, 1);
break;
case self::UTF16:
case self::UTF16BE:
$data .= $this->_filename . "\0\0" . $this->_description . "\0\0";
$data .= Transform::toString16($this->_filename, false, 1) .
Transform::toString16($this->_description, false, 1);
break;
default:
$data .= $this->_filename . "\0" . $this->_description . "\0";