Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4941 from ByteHamster/fix-chapters-multiple-nullbytes 

Fix parsing chapters with multiple null bytes
This commit is contained in:
ByteHamster 2021-02-16 09:38:02 +01:00 committed by GitHub
parent aaeea78b37 4f2dcc189c
commit fe0c710bc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ChapterReader.java
View File

@ -53,7 +53,7 @@ public class ChapterReader extends ID3Reader {
| ((int) startTimeSource[2] << 8) | startTimeSource[3];
currentChapter = new ID3Chapter(elementId.toString(), startTime);
skipBytes(input, 12);
return ID3Reader.ACTION_DONT_SKIP;
return ID3Reader.ACTION_DONT_SKIP; // Let reader discover the sub-frames
case FRAME_ID_TITLE:
if (currentChapter != null && currentChapter.getTitle() == null) {
StringBuilder title = new StringBuilder();
@ -62,7 +62,7 @@ public class ChapterReader extends ID3Reader {
.setTitle(title.toString());
Log.d(TAG, "Found title: " + currentChapter.getTitle());
return ID3Reader.ACTION_DONT_SKIP;
return ID3Reader.ACTION_SKIP;
}
break;
case FRAME_ID_LINK:
@ -79,7 +79,7 @@ public class ChapterReader extends ID3Reader {
Log.w(TAG, "Bad URL found in ID3 data");
}
return ID3Reader.ACTION_DONT_SKIP;
return ID3Reader.ACTION_SKIP;
}
break;
case FRAME_ID_PICTURE:
@ -109,7 +109,7 @@ public class ChapterReader extends ID3Reader {
}
skipBytes(input, length);
}
return ID3Reader.ACTION_DONT_SKIP;
return ID3Reader.ACTION_SKIP;
}
break;
}

16
core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java
View File

@ -20,7 +20,14 @@ public class ID3Reader {
private static final int ID3_LENGTH = 3;
private static final int FRAME_ID_LENGTH = 4;
private static final int ACTION_SKIP = 1;
/**
* Should skip remaining bytes of the current frame.
*/
static final int ACTION_SKIP = 1;
/**
* Should not skip remaining bytes of the current frame. Can be used to parse sub-frames.
*/
static final int ACTION_DONT_SKIP = 2;
private int readerPosition;
@ -49,12 +56,17 @@ public class ID3Reader {
if (checkForNullString(frameHeader.getId())) {
break;
}
int readerPositionBeforeFrame = input.getCount();
rc = onStartFrameHeader(frameHeader, input);
if (rc == ACTION_SKIP) {
if (frameHeader.getSize() + readerPosition > tagHeader.getSize()) {
break;
}
skipBytes(input, frameHeader.getSize());
int bytesAlreadyHandled = input.getCount() - readerPositionBeforeFrame;
int bytesLeftToSkip = frameHeader.getSize() - bytesAlreadyHandled;
if (bytesLeftToSkip > 0) {
skipBytes(input, bytesLeftToSkip);
}
}
}
}

19
core/src/main/java/de/danoeh/antennapod/core/util/id3reader/model/FrameHeader.java
View File

@ -1,17 +1,20 @@
package de.danoeh.antennapod.core.util.id3reader.model;
import androidx.annotation.NonNull;
public class FrameHeader extends Header {
private final char flags;
private final char flags;
public FrameHeader(String id, int size, char flags) {
super(id, size);
this.flags = flags;
}
public FrameHeader(String id, int size, char flags) {
super(id, size);
this.flags = flags;
}
@Override
public String toString() {
return String.format("FrameHeader [flags=%s, id=%s, size=%s]", Integer.toBinaryString(flags), id, Integer.toBinaryString(size));
@Override
@NonNull
public String toString() {
return String.format("FrameHeader [flags=%s, id=%s, size=%s]", Integer.toBinaryString(flags), id, size);
}
}