Skip to content

Fix for blank line in comment tag and empty PRIV frame. #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Frankenslag wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for blank line in comment tag and empty PRIV frame. #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/Id3.Net/Id3/v2/Id3v23Handler.Frames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,17 @@ private static Id3Frame DecodePrivate(byte[] data)
var frame = new PrivateFrame();
byte[] splitterSequence = TextEncodingHelper.GetSplitterBytes(Id3TextEncoding.Iso8859_1);
byte[] ownerIdBytes = ByteArrayHelper.GetBytesUptoSequence(data, 0, splitterSequence);
frame.OwnerId =
TextEncodingHelper.GetString(ownerIdBytes, 0, ownerIdBytes.Length, Id3TextEncoding.Iso8859_1);
frame.Data = new byte[data.Length - ownerIdBytes.Length - splitterSequence.Length];
Array.Copy(data, ownerIdBytes.Length + splitterSequence.Length, frame.Data, 0, frame.Data.Length);
if(ownerIdBytes != null)
{
frame.OwnerId =
TextEncodingHelper.GetString(ownerIdBytes, 0, ownerIdBytes.Length, Id3TextEncoding.Iso8859_1);
frame.Data = new byte[data.Length - ownerIdBytes.Length - splitterSequence.Length];
Array.Copy(data, ownerIdBytes.Length + splitterSequence.Length, frame.Data, 0, frame.Data.Length);
}
else
{
frame.Data = new byte[0];
}
return frame;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Id3.Net/Utils/TextEncodingHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ internal static string GetString(byte[] bytes, int start, int count, Id3TextEnco
Encoding encoding = GetEncoding(encodingType);
string str = encoding.GetString(bytes, start, count);

if (encodingType == Id3TextEncoding.Unicode)
if (str.Length > 0 && encodingType == Id3TextEncoding.Unicode)
{
if (str[0] == '\xFFFE' || str[0] == '\xFEFF')
str = str.Remove(0, 1);
Expand Down